diff --git a/.travis.yml b/.travis.yml index 7969f5b..1d9d418 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,14 +32,14 @@ before_script: script: - cd qt5 - - qmake -qt=5 GTA5SYNC_PREFIX=/usr QMAKE_CXXFLAGS+=-std=c++11 DEFINES+=GTA5SYNC_BUILDTYPE_DEV "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"$PACKAGE_VERSION-dev4\\\\\\\"" DEFINES+=GTA5SYNC_QCONF ../../gta5view.pro + - qmake -qt=5 GTA5SYNC_PREFIX=/usr QMAKE_CXXFLAGS+=-std=c++11 DEFINES+=GTA5SYNC_BUILDTYPE_DEV "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"$PACKAGE_VERSION-dev5\\\\\\\"" DEFINES+=GTA5SYNC_QCONF ../../gta5view.pro - make -j 4 - - sudo checkinstall -D --default --nodoc --install=no --pkgname=gta5view-qt5 --pkgversion=$PACKAGE_VERSION --pkgrelease=dev4 --pkggroup=utility --maintainer="Syping on Travis \" --requires=libqt5core5a,libqt5gui5,libqt5network5,libqt5widgets5,qttranslations5-l10n --conflicts=gta5view,gta5view-qt4 --replaces=gta5view,gta5view-qt4 --pakdir=../../package + - sudo checkinstall -D --default --nodoc --install=no --pkgname=gta5view-qt5 --pkgversion=$PACKAGE_VERSION --pkgrelease=dev5 --pkggroup=utility --maintainer="Syping on Travis \" --requires=libqt5core5a,libqt5gui5,libqt5network5,libqt5widgets5,qttranslations5-l10n --conflicts=gta5view,gta5view-qt4 --replaces=gta5view,gta5view-qt4 --pakdir=../../package - cd .. - cd qt4 - - qmake -qt=4 GTA5SYNC_PREFIX=/usr QMAKE_CXXFLAGS+=-std=c++11 DEFINES+=GTA5SYNC_BUILDTYPE_DEV "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"$PACKAGE_VERSION-dev4\\\\\\\"" DEFINES+=GTA5SYNC_QCONF ../../gta5view.pro + - qmake -qt=4 GTA5SYNC_PREFIX=/usr QMAKE_CXXFLAGS+=-std=c++11 DEFINES+=GTA5SYNC_BUILDTYPE_DEV "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"$PACKAGE_VERSION-dev5\\\\\\\"" DEFINES+=GTA5SYNC_QCONF ../../gta5view.pro - make -j 4 - - sudo checkinstall -D --default --nodoc --install=no --pkgname=gta5view-qt4 --pkgversion=$PACKAGE_VERSION --pkgrelease=dev4 --pkggroup=utility --maintainer="Syping on Travis \" --requires=libqtcore4,libqtgui4,libqt4-network,qtcore4-l10n --conflicts=gta5view,gta5view-qt5 --replaces=gta5view,gta5view-qt5 --pakdir=../../package + - sudo checkinstall -D --default --nodoc --install=no --pkgname=gta5view-qt4 --pkgversion=$PACKAGE_VERSION --pkgrelease=dev5 --pkggroup=utility --maintainer="Syping on Travis \" --requires=libqtcore4,libqtgui4,libqt4-network,qtcore4-l10n --conflicts=gta5view,gta5view-qt5 --replaces=gta5view,gta5view-qt5 --pakdir=../../package - cd .. deploy: diff --git a/PictureDialog.cpp b/PictureDialog.cpp index 1e8837c..e5124ed 100755 --- a/PictureDialog.cpp +++ b/PictureDialog.cpp @@ -763,7 +763,16 @@ void PictureDialog::editSnapmaticProperties() void PictureDialog::editSnapmaticRawJson() { SnapmaticPicture *picture = smpic; - JsonEditorDialog *jsonEditor = new JsonEditorDialog(picture, this); + JsonEditorDialog *jsonEditor; + if (rqFullscreen && fullscreenWidget != nullptr) + { + jsonEditor = new JsonEditorDialog(picture, fullscreenWidget); + } + else + { + jsonEditor = new JsonEditorDialog(picture, this); + } + jsonEditor->setWindowIcon(windowIcon()); jsonEditor->setModal(true); jsonEditor->show(); jsonEditor->exec(); diff --git a/ProfileInterface.cpp b/ProfileInterface.cpp index 50ea5c5..a315b5a 100755 --- a/ProfileInterface.cpp +++ b/ProfileInterface.cpp @@ -131,10 +131,12 @@ void ProfileInterface::setProfileFolder(QString folder, QString profile) void ProfileInterface::setupProfileInterface() { + fixedPictures.clear(); ui->labProfileLoading->setText(tr("Loading...")); profileLoader = new ProfileLoader(profileFolder, crewDB); QObject::connect(profileLoader, SIGNAL(savegameLoaded(SavegameData*, QString)), this, SLOT(savegameLoaded_event(SavegameData*, QString))); QObject::connect(profileLoader, SIGNAL(pictureLoaded(SnapmaticPicture*)), this, SLOT(pictureLoaded_event(SnapmaticPicture*))); + QObject::connect(profileLoader, SIGNAL(pictureFixed(SnapmaticPicture*)), this, SLOT(pictureFixed_event(SnapmaticPicture*))); QObject::connect(profileLoader, SIGNAL(loadingProgress(int,int)), this, SLOT(loadingProgress(int,int))); QObject::connect(profileLoader, SIGNAL(finished()), this, SLOT(profileLoaded_p())); profileLoader->start(); @@ -169,6 +171,12 @@ void ProfileInterface::pictureLoaded_event(SnapmaticPicture *picture) pictureLoaded(picture, false); } +void ProfileInterface::pictureFixed_event(SnapmaticPicture *picture) +{ + QString fixedPicture = picture->getPictureStr() % " (" % picture->getPictureTitl() % ")"; + fixedPictures << fixedPicture; +} + void ProfileInterface::pictureLoaded(SnapmaticPicture *picture, bool inserted) { SnapmaticWidget *picWidget = new SnapmaticWidget(profileDB, crewDB, threadDB, this); @@ -342,6 +350,19 @@ void ProfileInterface::profileLoaded_p() ui->cmdImport->setEnabled(true); isProfileLoaded = true; emit profileLoaded(); + + if (!fixedPictures.isEmpty()) + { + int fixedInt = 0; + QString fixedStr; + for (QString fixedPicture : fixedPictures) + { + if (fixedInt != 0) { fixedStr += "
"; } + fixedStr += fixedPicture; + fixedInt++; + } + QMessageBox::information(this, tr("Snapmatic Loader"), tr("

Following Snapmatic Pictures got repaired

%1").arg(fixedStr)); + } } void ProfileInterface::savegameDeleted_event() @@ -755,6 +776,7 @@ bool ProfileInterface::importFile(QString selectedFile, QDateTime importDateTime bool ProfileInterface::importSnapmaticPicture(SnapmaticPicture *picture, bool warn) { QString picFileName = picture->getPictureFileName(); + qDebug() << picFileName; QString adjustedFileName = picture->getOriginalPictureFileName(); if (picFileName.left(4) != "PGTA") { @@ -768,6 +790,7 @@ bool ProfileInterface::importSnapmaticPicture(SnapmaticPicture *picture, bool wa } else if (picture->exportPicture(profileFolder % "/" % adjustedFileName, SnapmaticFormat::PGTA_Format)) { + picture->setSnapmaticFormat(SnapmaticFormat::PGTA_Format); picture->setPicFilePath(profileFolder % "/" % adjustedFileName); pictureLoaded(picture, true); return true; diff --git a/ProfileInterface.h b/ProfileInterface.h index 8ccf76b..ad0f666 100755 --- a/ProfileInterface.h +++ b/ProfileInterface.h @@ -69,6 +69,7 @@ private slots: void on_cmdCloseProfile_clicked(); void on_cmdImport_clicked(); void pictureLoaded_event(SnapmaticPicture *picture); + void pictureFixed_event(SnapmaticPicture *picture); void savegameLoaded_event(SavegameData *savegame, QString savegamePath); void loadingProgress(int value, int maximum); void pictureDeleted_event(); @@ -95,6 +96,7 @@ private: QList pictures; QMap widgets; QSpacerItem *saSpacerItem; + QStringList fixedPictures; QColor highlightBackColor; QColor highlightTextColor; QString enabledPicStr; diff --git a/ProfileLoader.cpp b/ProfileLoader.cpp index ec7b28a..3874140 100755 --- a/ProfileLoader.cpp +++ b/ProfileLoader.cpp @@ -78,6 +78,14 @@ void ProfileLoader::run() SnapmaticPicture *picture = new SnapmaticPicture(picturePath); if (picture->readingPicture(true, true, true)) { + if (picture->isFormatSwitched()) + { + picture->setSnapmaticFormat(SnapmaticFormat::PGTA_Format); + if (picture->exportPicture(picturePath, SnapmaticFormat::PGTA_Format)) + { + emit pictureFixed(picture); + } + } emit pictureLoaded(picture); int crewNumber = picture->getSnapmaticProperties().crewID; if (!crewList.contains(crewNumber)) diff --git a/ProfileLoader.h b/ProfileLoader.h index 4de52fe..472c27d 100755 --- a/ProfileLoader.h +++ b/ProfileLoader.h @@ -45,6 +45,7 @@ private slots: signals: void pictureLoaded(SnapmaticPicture *picture); + void pictureFixed(SnapmaticPicture *picture); void savegameLoaded(SavegameData *savegame, QString savegamePath); void loadingProgress(int value, int maximum); }; diff --git a/SnapmaticPicture.cpp b/SnapmaticPicture.cpp index 4d9147e..a25b7f0 100755 --- a/SnapmaticPicture.cpp +++ b/SnapmaticPicture.cpp @@ -91,6 +91,7 @@ void SnapmaticPicture::reset() // INIT PIC BOOLS isCustomFormat = false; + isFormatSwitch = false; isLoadedInRAM = false; lowRamMode = false; picOk = false; @@ -115,6 +116,9 @@ bool SnapmaticPicture::preloadFile() QFile *picFile = new QFile(picFilePath); picFileName = QFileInfo(picFilePath).fileName(); + bool g5eMode = false; + isFormatSwitch = false; + if (!picFile->open(QFile::ReadOnly)) { lastStep = "1;/1,OpenFile," % StringParser::convertDrawStringForLog(picFilePath); @@ -123,19 +127,38 @@ bool SnapmaticPicture::preloadFile() } if (picFilePath.right(4) != QLatin1String(".g5e")) { - rawPicContent = picFile->read(snapmaticFileMaxSize); + rawPicContent = picFile->read(snapmaticFileMaxSize + 1024); picFile->close(); delete picFile; - // Setting is values - isCustomFormat = false; - isLoadedInRAM = true; + if (rawPicContent.mid(1, 3) == QByteArray("G5E")) + { + isFormatSwitch = true; + } + else + { + isCustomFormat = false; + isLoadedInRAM = true; + } } else { - QByteArray g5eContent = picFile->read(snapmaticFileMaxSize + 1024); - picFile->close(); - delete picFile; + g5eMode = true; + } + if (g5eMode || isFormatSwitch) + { + QByteArray g5eContent; + if (!isFormatSwitch) + { + g5eContent = picFile->read(snapmaticFileMaxSize + 1024); + picFile->close(); + delete picFile; + } + else + { + g5eContent = rawPicContent; + rawPicContent.clear(); + } // Set Custom Format isCustomFormat = true; @@ -1191,6 +1214,37 @@ void SnapmaticPicture::setSnapmaticDefaultsEnforced(bool enforced) careSnapDefault = enforced; } +// SNAPMATIC FORMAT + +SnapmaticFormat SnapmaticPicture::getSnapmaticFormat() +{ + if (isCustomFormat) + { + return SnapmaticFormat::G5E_Format; + } + return SnapmaticFormat::PGTA_Format; +} + +void SnapmaticPicture::setSnapmaticFormat(SnapmaticFormat format) +{ + if (format == SnapmaticFormat::G5E_Format) + { + isCustomFormat = true; + return; + } + else if (format == SnapmaticFormat::PGTA_Format) + { + isCustomFormat = false; + return; + } + qDebug() << "setSnapmaticFormat: Invalid SnapmaticFormat defined, valid SnapmaticFormats are G5E_Format and PGTA_Format"; +} + +bool SnapmaticPicture::isFormatSwitched() +{ + return isFormatSwitch; +} + // VERIFY CONTENT bool SnapmaticPicture::verifyTitle(const QString &title) diff --git a/SnapmaticPicture.h b/SnapmaticPicture.h index 206a9ec..c41015f 100755 --- a/SnapmaticPicture.h +++ b/SnapmaticPicture.h @@ -111,6 +111,11 @@ public: bool isSnapmaticDefaultsEnforced(); void setSnapmaticDefaultsEnforced(bool enforced); + // SNAPMATIC FORMAT + SnapmaticFormat getSnapmaticFormat(); + void setSnapmaticFormat(SnapmaticFormat format); + bool isFormatSwitched(); + // VERIFY CONTENT static bool verifyTitle(const QString &title); @@ -134,6 +139,7 @@ private: bool cacheEnabled; bool isLoadedInRAM; bool isCustomFormat; + bool isFormatSwitch; bool careSnapDefault; int jpegRawContentSize; int jpegRawContentSizeE; diff --git a/SnapmaticWidget.cpp b/SnapmaticWidget.cpp index 789c2e9..23210d5 100755 --- a/SnapmaticWidget.cpp +++ b/SnapmaticWidget.cpp @@ -72,7 +72,7 @@ void SnapmaticWidget::setSnapmaticPicture(SnapmaticPicture *picture) ui->labPicture->setFixedSize(48 * screenRatio, 27 * screenRatio); QPixmap SnapmaticPixmap = QPixmap::fromImage(picture->getImage().scaled(ui->labPicture->width(), ui->labPicture->height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation), Qt::AutoColor); - ui->labPicStr->setText(smpic->getPictureStr() % "\n" % smpic->getPictureTitl() % ""); + ui->labPicStr->setText(smpic->getPictureStr() % "\n" % smpic->getPictureTitl()); ui->labPicture->setPixmap(SnapmaticPixmap); picture->clearCache(); diff --git a/config.h b/config.h index 0848287..7740d23 100755 --- a/config.h +++ b/config.h @@ -50,7 +50,7 @@ #ifndef GTA5SYNC_APPVER #ifndef GTA5SYNC_DAILYB -#define GTA5SYNC_APPVER "1.5.0-dev4" +#define GTA5SYNC_APPVER "1.5.0-dev5" #else #define GTA5SYNC_APPVER GTA5SYNC_DAILYB #endif diff --git a/res/app.rc b/res/app.rc index 3cfc1b1..7e7ea47 100755 --- a/res/app.rc +++ b/res/app.rc @@ -25,12 +25,12 @@ BEGIN BEGIN VALUE "CompanyName", "Syping" VALUE "FileDescription", "gta5view\0" - VALUE "FileVersion", "1.5.0-dev4\0" + VALUE "FileVersion", "1.5.0-dev5\0" VALUE "InternalName", "gta5view\0" VALUE "LegalCopyright", "Copyright 2016-2017 Syping\0" VALUE "OriginalFilename", "gta5view.exe\0" VALUE "ProductName", "gta5view\0" - VALUE "ProductVersion", "1.5.0-dev4\0" + VALUE "ProductVersion", "1.5.0-dev5\0" END END END diff --git a/res/gta5sync_de.qm b/res/gta5sync_de.qm index dcb336b..77abfa8 100755 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 f920076..190af4e 100755 --- a/res/gta5sync_de.ts +++ b/res/gta5sync_de.ts @@ -427,14 +427,14 @@ Wenn du planst es als Avatar zu verwenden das Bild wird abgetrennt! - + 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 @@ -974,7 +974,7 @@ Y: %2 - + Export as &Picture... Als &Bild exportieren... @@ -984,7 +984,7 @@ Y: %2 - + Export as &Snapmatic... Als &Snapmatic exportieren... @@ -998,7 +998,7 @@ Y: %2 - + &Edit Properties... Eigenschaften bearb&eiten... @@ -1013,7 +1013,7 @@ Y: %2 - + Open &Map Viewer... &Kartenansicht öffnen... @@ -1267,7 +1267,7 @@ Drücke A für Standardansicht - + Open &JSON Editor... &JSON Editor öffnen... @@ -1331,30 +1331,40 @@ Drücke A für Standardansicht Profil schließen - + Loading... Lade... - - + + Snapmatic Loader + Snapmatic Lader + + + + <h4>Following Snapmatic Pictures got repaired</h4>%1 + <h4>Folgende Snapmatic Bilder wurden repariert</h4>%1 + + + + Import... Importieren... - - - - - - - - - - - - - + + + + + + + + + + + + + Import Importieren @@ -1367,13 +1377,13 @@ Drücke A für Standardansicht Importfähige Dateien (*.g5e *.jpg *.png SGTA* PGTA*) - + Savegames files (SGTA*) Spielstanddateien (SGTA*) - + Snapmatic pictures (PGTA*) Snapmatic Bilder (PGTA*) @@ -1383,29 +1393,29 @@ Drücke A für Standardansicht Alle Bilddateien (*.jpg *.png) - + Importable files (%1) Importfähige Dateien (%1) - + All image files (%1) Alle Bilddateien (%1) - + All files (**) Alle Dateien (**) - - + + Import file %1 of %2 files Importiere Datei %1 von %2 Dateien - + Import failed with... %1 @@ -1414,29 +1424,29 @@ Drücke A für Standardansicht %1 - + Failed to read Snapmatic picture Fehler beim Lesen vom Snapmatic Bild - + Failed to read Savegame file Fehler beim Lesen von Spielstanddatei - + Can't import %1 because file can't be parsed properly Kann %1 nicht importieren weil die Datei nicht richtig gelesen werden kann - + Can't import %1 because file format can't be detected Kann %1 nicht importieren weil das Dateiformat nicht erkannt werden kann - + Initialising export... Initialisiere Export... @@ -1445,23 +1455,23 @@ Drücke A für Standardansicht Kann %1 nicht importieren weil das Dateiformat nicht gültig ist - + Failed to import the Snapmatic picture, file not begin with PGTA or end with .g5e Fehlgeschlagen beim Importieren vom Snapmatic Bild, Datei beginnt nicht mit PGTA oder endet mit .g5e - + Failed to import the Snapmatic picture, the picture is already in the game Fehlgeschlagen beim Importieren vom Snapmatic Bild, dieses Bild ist bereits im Spiel - + %1Export Snapmatic pictures%2<br><br>JPG pictures make it possible to open the picture with a Image Viewer<br>GTA Snapmatic make it possible to import the picture into the game<br><br>Export as: %1Exportiere Snapmatic Bilder%2<br><br>JPG Bilder machen es möglich sie mit ein Bildansicht Programm zu öffnen<br>Das GTA Snapmatic Format macht es möglich sie wieder ins Game zu importieren<br><br>Exportieren als: - - + + No valid file is selected Keine gültige Datei wurde ausgewählt @@ -1476,35 +1486,35 @@ Drücke A für Standardansicht Fehlgeschlagen beim Importieren vom Snapmatic Bild, Datei beginnt nicht mit PGTA - + Failed to import the Snapmatic picture, can't copy the file into profile Fehlgeschlagen beim Importieren vom Snapmatic Bild, kann Snapmatic Bild nicht ins Profil kopieren - + Failed to import the Savegame, can't copy the file into profile Fehlgeschlagen beim Importieren vom Spielstand, kann Spielstanddatei nicht ins Profil kopieren - + Failed to import the Savegame, no Savegame slot is left Fehlgeschlagen beim Importieren vom Spielstand, kein Spielstandslot mehr frei - - + + JPG pictures and GTA Snapmatic JPG Bilder und GTA Snapmatic - - + + JPG pictures only Nur JPG Bilder - - + + GTA Snapmatic only Nur GTA Snapmatic @@ -1523,25 +1533,25 @@ Das GTA Snapmatic Format macht es möglich sie wieder ins Game zu importieren Exportieren als: - - + + No Snapmatic pictures or Savegames files are selected Keine Snapmatic Bilder oder Spielstände ausgewählt - - - + + + Remove selected Auswahl löschen - + You really want remove the selected Snapmatic picutres and Savegame files? Möchtest du wirklich die ausgewählten Snapmatic Bilder und Spielstanddateien löschen? - + Failed at remove the complete selected Snapmatic pictures and/or Savegame files Fehlgeschlagen beim kompletten entfernen der ausgewählten Snapmatic Bilder und/oder der Spielstanddateien @@ -1562,10 +1572,10 @@ Exportieren als: Fehlgeschlagenen beim Import vom Spielstand weil kein Spielstandslot mehr übrig ist - - - - + + + + Export selected Auswahl exportieren @@ -1586,7 +1596,7 @@ Exportieren als: Wie sollen wir mit den Snapmatic Bilder umgehen? - + Export selected... Auswahl exportieren... @@ -1599,7 +1609,7 @@ Exportieren als: Initialisierung... - + Export failed with... %1 @@ -1634,7 +1644,7 @@ Exportieren als: Alle Profildateien (*.g5e SGTA* PGTA*) - + GTA V Export (*.g5e) GTA V Export (*.g5e) @@ -1803,32 +1813,32 @@ Exportieren als: Fehlgeschlagen beim Löschen %1 von deinen Spielständen - + &View A&nsehen - + &Remove Entfe&rnen - + &Select Au&swählen - + &Deselect A&bwählen - + Select &All &Alles auswählen - + &Deselect All Alles a&bwählen @@ -1867,7 +1877,7 @@ Exportieren als: Spielstand kopieren - + &Export &Exportieren @@ -2110,7 +2120,7 @@ Exportieren als: SnapmaticPicture - + PHOTO - %1 FOTO - %1 @@ -2160,7 +2170,7 @@ Exportieren als: Bist du sicher %1 von deine Snapmatic Bilder zu löschen? - + Edi&t Bearbei&ten @@ -2173,7 +2183,7 @@ Exportieren als: &Im Spiel deaktivieren - + &Export &Exportieren @@ -2186,12 +2196,12 @@ Exportieren als: Exportiere als &GTA Snapmatic - + Show &In-game &Im Spiel anzeigen - + Hide &In-game &Im Spiel ausblenden @@ -2224,32 +2234,32 @@ Exportieren als: Exportiere als &Snapmatic... - + &View A&nsehen - + &Remove Entfe&rnen - + &Select Au&swählen - + &Deselect A&bwählen - + Select &All Alles &auswählen - + &Deselect All Alles a&bwählen diff --git a/res/gta5sync_en_US.qm b/res/gta5sync_en_US.qm index f097a03..a017ab7 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 46170db..91f0e24 100644 --- a/res/gta5sync_en_US.ts +++ b/res/gta5sync_en_US.ts @@ -238,14 +238,14 @@ Pictures and Savegames - + Custom Avatar Custom Avatar Description in SC, don't use Special Character! - + Custom Picture Custom Picture Description in SC, don't use Special Character! @@ -624,25 +624,25 @@ Y: %2 - + Export as &Picture... - + Export as &Snapmatic... - + &Edit Properties... - + Open &Map Viewer... @@ -793,7 +793,7 @@ Press 1 for Default View - + Open &JSON Editor... @@ -848,202 +848,212 @@ Press 1 for Default View - + Loading... - - + + Snapmatic Loader + + + + + <h4>Following Snapmatic Pictures got repaired</h4>%1 + + + + + Import... - - - - - - - - - - - - - + + + + + + + + + + + + + Import - + Importable files (%1) - + GTA V Export (*.g5e) - + Savegames files (SGTA*) - + Snapmatic pictures (PGTA*) - + All image files (%1) - + All files (**) - - + + No valid file is selected - - + + Import file %1 of %2 files - + Import failed with... %1 - + Failed to read Snapmatic picture - + Failed to read Savegame file - + Can't import %1 because file can't be parsed properly - + Can't import %1 because file format can't be detected - + Failed to import the Snapmatic picture, file not begin with PGTA or end with .g5e - + Failed to import the Snapmatic picture, the picture is already in the game - + Failed to import the Snapmatic picture, can't copy the file into profile - + Failed to import the Savegame, can't copy the file into profile - + Failed to import the Savegame, no Savegame slot is left - - - - + + + + Export selected - - + + JPG pictures and GTA Snapmatic - - + + JPG pictures only - - + + GTA Snapmatic only - + %1Export Snapmatic pictures%2<br><br>JPG pictures make it possible to open the picture with a Image Viewer<br>GTA Snapmatic make it possible to import the picture into the game<br><br>Export as: - + Export selected... - + Initialising export... Initializing export... - + Export failed with... %1 - - + + No Snapmatic pictures or Savegames files are selected - - - + + + Remove selected - + You really want remove the selected Snapmatic picutres and Savegame files? - + Failed at remove the complete selected Snapmatic pictures and/or Savegame files @@ -1144,37 +1154,37 @@ Press 1 for Default View - + &View - + &Export - + &Remove - + &Select - + &Deselect - + Select &All - + &Deselect All @@ -1423,7 +1433,7 @@ Press 1 for Default View SnapmaticPicture - + PHOTO - %1 @@ -1483,52 +1493,52 @@ Press 1 for Default View - + Edi&t - + Show &In-game - + Hide &In-game - + &Export - + &View - + &Remove - + &Select - + &Deselect - + Select &All - + &Deselect All diff --git a/res/gta5sync_fr.qm b/res/gta5sync_fr.qm index 53ccfdd..1750a3e 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 096568d..cbdeee8 100644 --- a/res/gta5sync_fr.ts +++ b/res/gta5sync_fr.ts @@ -363,14 +363,14 @@ et les fichiers de sauvegarde de Grand Theft Auto V - + Custom Avatar Custom Avatar Description in SC, don't use Special Character! - + Custom Picture Custom Picture Description in SC, don't use Special Character! @@ -903,7 +903,7 @@ Y: %2 - + Export as &Picture... @@ -913,7 +913,7 @@ Y: %2 - + Export as &Snapmatic... @@ -923,13 +923,13 @@ Y: %2 - + &Edit Properties... Modifier les &propriétés... - + Open &Map Viewer... @@ -1021,7 +1021,7 @@ Appuyer sur 1 pour le mode par défaut - + Open &JSON Editor... @@ -1080,30 +1080,40 @@ Appuyer sur 1 pour le mode par défaut Photos activées : %1 sur %2 - + Loading... Chargement... - - + + Snapmatic Loader + + + + + <h4>Following Snapmatic Pictures got repaired</h4>%1 + + + + + Import... Importer... - - - - - - - - - - - - - + + + + + + + + + + + + + Import Importer @@ -1112,36 +1122,36 @@ Appuyer sur 1 pour le mode par défaut Fichiers de profil GTA (SGTA* PGTA*) - + Savegames files (SGTA*) Fichiers de sauvegarde GTA (SGTA*) - + Snapmatic pictures (PGTA*) Photos Snapmatic (PGTA*) - + All image files (%1) - + All files (**) Tous les fichiers (**) - - + + Import file %1 of %2 files Importation du fichier %1 sur %2 - + Import failed with... %1 @@ -1150,25 +1160,25 @@ Appuyer sur 1 pour le mode par défaut %1 - - + + No valid file is selected Fichier invalide - + Importable files (%1) - + Failed to read Snapmatic picture Impossible d'ouvrir la photo Snapmatic - + Failed to read Savegame file Impossible de lire le fichier de sauvegarde @@ -1190,78 +1200,78 @@ Appuyer sur 1 pour le mode par défaut Tous les fichiers image (*.jpg *.png) - + Can't import %1 because file can't be parsed properly - + Can't import %1 because file format can't be detected - + Failed to import the Snapmatic picture, file not begin with PGTA or end with .g5e Impossible d'importer la photo Snapmatic,nom de fichier incorrect (PGTA*, *.g5e) - + Failed to import the Snapmatic picture, the picture is already in the game Impossible d'importer la photo Snapmatic, un fichier du même nom existe déjà - + Failed to import the Snapmatic picture, can't copy the file into profile Impossible d'importer la photo Snapmatic, impossible de copier le fichier dans le profil - + Failed to import the Savegame, can't copy the file into profile Impossible d'importer la sauvegarde, impossible de copier le fichier dans le profil - + Failed to import the Savegame, no Savegame slot is left Impossible d'importer la sauvegarde, aucun emplacement libre - - - - + + + + Export selected Exporter la sélection - - + + JPG pictures and GTA Snapmatic Images JPG et GTA Snapmatic - - + + JPG pictures only Images JPG seulement - - + + GTA Snapmatic only GTA Snapmatic seulement - + %1Export Snapmatic pictures%2<br><br>JPG pictures make it possible to open the picture with a Image Viewer<br>GTA Snapmatic make it possible to import the picture into the game<br><br>Export as: %1Exporter les photos Snapmatic%2<br><br>Les fichiers JPG permettent d'ouvrir les photos avec une visionneuse d'images<br>Les GTA Snapmatic permettent d'importer les photos dans le jeu<br><br>Exporter comme : - + Export selected... Exporter la sélection... - + Initialising export... @@ -1270,7 +1280,7 @@ Appuyer sur 1 pour le mode par défaut Initialisation de l'export... - + Export failed with... %1 @@ -1279,25 +1289,25 @@ Appuyer sur 1 pour le mode par défaut %1 - - + + No Snapmatic pictures or Savegames files are selected Aucun fichier de sauvegarde ou photo Snapmatic sélectionné - - - + + + Remove selected Supprimer la sélection - + You really want remove the selected Snapmatic picutres and Savegame files? Supprimer la sélection ? - + Failed at remove the complete selected Snapmatic pictures and/or Savegame files Impossible de supprimer la sélection @@ -1307,7 +1317,7 @@ Appuyer sur 1 pour le mode par défaut Tous les fichiers de profil (*.g5e SGTA* PGTA*) - + GTA V Export (*.g5e) GTA V Export (*.g5e) @@ -1404,7 +1414,7 @@ Appuyer sur 1 pour le mode par défaut Supprimer - + &Export &Exporter @@ -1495,32 +1505,32 @@ Appuyer sur 1 pour le mode par défaut Impossible de supprimer %1 - + &View &Voir - + &Remove &Supprimer - + &Select &Sélectionner - + &Deselect &Déselectionner - + Select &All Sélectionner to&ut - + &Deselect All &Déselectionner tout @@ -1691,7 +1701,7 @@ Appuyer sur 1 pour le mode par défaut SnapmaticPicture - + PHOTO - %1 PHOTO - %1 @@ -1761,17 +1771,17 @@ Appuyer sur 1 pour le mode par défaut Impossible de supprimer %1 - + Edi&t Édi&ter - + Show &In-game &Visible en jeu - + Hide &In-game &Invisible en jeu @@ -1780,7 +1790,7 @@ Appuyer sur 1 pour le mode par défaut Modifier les &propriétés... - + &Export &Exporter @@ -1793,32 +1803,32 @@ Appuyer sur 1 pour le mode par défaut Exporter comme &GTA Snapmatic... - + &View &Voir - + &Remove S&upprimer - + &Select &Sélectionner - + &Deselect &Déselectionner - + Select &All Sélectionner &tout - + &Deselect All &Déselectionner tout diff --git a/res/gta5sync_ru.qm b/res/gta5sync_ru.qm index 71a4daf..8579c33 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 272f721..bdfc27a 100644 --- a/res/gta5sync_ru.ts +++ b/res/gta5sync_ru.ts @@ -326,14 +326,14 @@ Grand Theft Auto V Snapmatic картинок и сохранений - + Custom Avatar Custom Avatar Description in SC, don't use Special Character! - + Custom Picture Custom Picture Description in SC, don't use Special Character! @@ -782,7 +782,7 @@ Y: %2 - + Export as &Picture... Экспортировать как &картинку... @@ -792,7 +792,7 @@ Y: %2 - + Export as &Snapmatic... Экспортировать как &Snapmatic... @@ -806,13 +806,13 @@ Y: %2 - + &Edit Properties... &Изменить свойства... - + Open &Map Viewer... @@ -1004,7 +1004,7 @@ Press 1 for Default View - + Open &JSON Editor... @@ -1059,30 +1059,40 @@ Press 1 for Default View Закрыть профиль - + Loading... Загрузка... - - + + Snapmatic Loader + + + + + <h4>Following Snapmatic Pictures got repaired</h4>%1 + + + + + Import... Импортировать... - - - - - - - - - - - - - + + + + + + + + + + + + + Import Импортировать @@ -1091,31 +1101,31 @@ Press 1 for Default View Все файлы профиля (SGTA* PGTA*) - + Savegames files (SGTA*) Файлы сохранения (SGTA*) - + Snapmatic pictures (PGTA*) Картинка Snapmatic (PGTA*) - + All files (**) Все файлы (**) - - + + Import file %1 of %2 files Импортируются файлы %1 из %2 - + Import failed with... %1 @@ -1124,13 +1134,13 @@ Press 1 for Default View %1 - + Failed to read Snapmatic picture Не удалось загрузить картинку Snapmatic - + Failed to read Savegame file Не удалось загрузить файл сохранения @@ -1140,8 +1150,8 @@ Press 1 for Default View Не получилось импортировать %1 из-за неправильного формата файла - - + + No valid file is selected Выбранный файл неверен @@ -1160,93 +1170,93 @@ Press 1 for Default View Все изображения (*.jpg *.png) - + Importable files (%1) Файлы для импорта (%1) - + All image files (%1) Все файлы изображений (%1) - + Can't import %1 because file can't be parsed properly Не получилось импортировать %1, файл не может быть правильно обработан - + Can't import %1 because file format can't be detected Не получилось импортировать %1, не удалось определить формат файла - + Failed to import the Snapmatic picture, file not begin with PGTA or end with .g5e Не удалось импортировать картинку Snapmatic, название не начинается с PGTA или не заканчивается с .g5e - + Failed to import the Snapmatic picture, the picture is already in the game Не удалось импортировать картинку Snapmatic, картинка уже в игре - + Failed to import the Snapmatic picture, can't copy the file into profile Не удалось импортировать картинку Snapmatic, не получилось скопировать файл в профиль - + Failed to import the Savegame, can't copy the file into profile Не удалось импортировать сохранение, не получилось скопировать файл в профиль - + Failed to import the Savegame, no Savegame slot is left Не удалось импортировать сохранение, нет пустых ячеек под сохранения - - + + JPG pictures and GTA Snapmatic Картинки JPG и GTA Snapmatic - - + + JPG pictures only Только картинки JPG - - + + GTA Snapmatic only Только GTA Snapmatic - + Initialising export... Подготовка к экспорту... - - + + No Snapmatic pictures or Savegames files are selected Не выделены ни один Snapmatic или сохранение - - - + + + Remove selected Снять выделение - + You really want remove the selected Snapmatic picutres and Savegame files? Точно ли хочешь удалить выбранные картинки Snapmatic и файлы сохранений? - + Failed at remove the complete selected Snapmatic pictures and/or Savegame files Не удалось удалить полностью выбранные картинки Snapmatic и/или файлы сохранений @@ -1267,20 +1277,20 @@ Press 1 for Default View Не получилось имортировать копию сохранения, потому что не осталось свободных под них слотов - - - - + + + + Export selected Экспортировать выделенное - + %1Export Snapmatic pictures%2<br><br>JPG pictures make it possible to open the picture with a Image Viewer<br>GTA Snapmatic make it possible to import the picture into the game<br><br>Export as: %1Эскпортировать картинки Snapmatic%2<br><br>Картинки JPG можно открыть любым просмотрщиком<br>Картинки формата GTA Snapmatic можно снова импортировать в игру<br><br>Экспортировать как: - + Export selected... Экпортировать выделенное... @@ -1289,7 +1299,7 @@ Press 1 for Default View Подготавливаю эскпорт... - + Export failed with... %1 @@ -1310,7 +1320,7 @@ Press 1 for Default View Все файлы профиля (*.g5e SGTA* PGTA*) - + GTA V Export (*.g5e) GTA V Export (*.g5e) @@ -1466,32 +1476,32 @@ Press 1 for Default View Не удалось удалить сохранение %1 - + &View &Просмотр - + &Remove &Удалить - + &Select &Выбрать - + &Deselect Сн&ять выбор - + Select &All В&ыбрать все - + &Deselect All Снять выбо&р со всех @@ -1501,7 +1511,7 @@ Press 1 for Default View Копировать сохранение - + &Export &Экспортировать @@ -1716,7 +1726,7 @@ Press 1 for Default View SnapmaticPicture - + PHOTO - %1 ФОТО - %1 @@ -1776,17 +1786,17 @@ Press 1 for Default View Не удалось удалить %1 из колелкции картинок Snapmatic - + Edi&t &Правка - + Show &In-game Показывать в &игре - + Hide &In-game Ск&рыть в игре @@ -1795,7 +1805,7 @@ Press 1 for Default View &Изменить свойства... - + &Export &Экспорт @@ -1808,32 +1818,32 @@ Press 1 for Default View Экс&портировать как GTA Snapmatic... - + &View По&казать - + &Remove У&далить - + &Select &Выделить - + &Deselect Сн&ять выделение - + Select &All В&ыбрать все - + &Deselect All Снять выбо&р со всех