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 \<travisci@syping.de\>" --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 \<travisci@syping.de\>" --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 \<travisci@syping.de\>" --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 \<travisci@syping.de\>" --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 += "<br>"; } + fixedStr += fixedPicture; + fixedInt++; + } + QMessageBox::information(this, tr("Snapmatic Loader"), tr("<h4>Following Snapmatic Pictures got repaired</h4>%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<SnapmaticPicture*> pictures; QMap<ProfileWidget*,QString> 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!</translation </message> <message> <location filename="../ImportDialog.cpp" line="105"/> - <location filename="../ProfileInterface.cpp" line="599"/> + <location filename="../ProfileInterface.cpp" line="620"/> <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="131"/> - <location filename="../ProfileInterface.cpp" line="618"/> + <location filename="../ProfileInterface.cpp" line="639"/> <source>Custom Picture</source> <comment>Custom Picture Description in SC, don't use Special Character!</comment> <translation>Eigenes Bild</translation> @@ -974,7 +974,7 @@ Y: %2</translation> </message> <message> <location filename="../PictureDialog.cpp" line="148"/> - <location filename="../ProfileInterface.cpp" line="1169"/> + <location filename="../ProfileInterface.cpp" line="1192"/> <source>Export as &Picture...</source> <translation>Als &Bild exportieren...</translation> </message> @@ -984,7 +984,7 @@ Y: %2</translation> </message> <message> <location filename="../PictureDialog.cpp" line="149"/> - <location filename="../ProfileInterface.cpp" line="1170"/> + <location filename="../ProfileInterface.cpp" line="1193"/> <source>Export as &Snapmatic...</source> <translation>Als &Snapmatic exportieren...</translation> </message> @@ -998,7 +998,7 @@ Y: %2</translation> </message> <message> <location filename="../PictureDialog.cpp" line="151"/> - <location filename="../ProfileInterface.cpp" line="1164"/> + <location filename="../ProfileInterface.cpp" line="1187"/> <source>&Edit Properties...</source> <translation>Eigenschaften bearb&eiten...</translation> </message> @@ -1013,7 +1013,7 @@ Y: %2</translation> </message> <message> <location filename="../PictureDialog.cpp" line="153"/> - <location filename="../ProfileInterface.cpp" line="1166"/> + <location filename="../ProfileInterface.cpp" line="1189"/> <source>Open &Map Viewer...</source> <translation>&Kartenansicht öffnen...</translation> </message> @@ -1267,7 +1267,7 @@ Drücke A für Standardansicht</translation> </message> <message> <location filename="../PictureDialog.cpp" line="155"/> - <location filename="../ProfileInterface.cpp" line="1167"/> + <location filename="../ProfileInterface.cpp" line="1190"/> <source>Open &JSON Editor...</source> <translation>&JSON Editor öffnen...</translation> </message> @@ -1331,30 +1331,40 @@ Drücke A für Standardansicht</translation> <translation type="obsolete">Profil schließen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="134"/> + <location filename="../ProfileInterface.cpp" line="135"/> <source>Loading...</source> <translation>Lade...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="416"/> - <location filename="../ProfileInterface.cpp" line="483"/> + <location filename="../ProfileInterface.cpp" line="364"/> + <source>Snapmatic Loader</source> + <translation>Snapmatic Lader</translation> + </message> + <message> + <location filename="../ProfileInterface.cpp" line="364"/> + <source><h4>Following Snapmatic Pictures got repaired</h4>%1</source> + <translation><h4>Folgende Snapmatic Bilder wurden repariert</h4>%1</translation> + </message> + <message> + <location filename="../ProfileInterface.cpp" line="437"/> + <location filename="../ProfileInterface.cpp" line="504"/> <source>Import...</source> <translation>Importieren...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="417"/> - <location filename="../ProfileInterface.cpp" line="462"/> - <location filename="../ProfileInterface.cpp" line="515"/> - <location filename="../ProfileInterface.cpp" line="535"/> - <location filename="../ProfileInterface.cpp" line="551"/> - <location filename="../ProfileInterface.cpp" line="666"/> - <location filename="../ProfileInterface.cpp" line="746"/> - <location filename="../ProfileInterface.cpp" line="751"/> - <location filename="../ProfileInterface.cpp" line="761"/> - <location filename="../ProfileInterface.cpp" line="766"/> - <location filename="../ProfileInterface.cpp" line="777"/> - <location filename="../ProfileInterface.cpp" line="814"/> - <location filename="../ProfileInterface.cpp" line="820"/> + <location filename="../ProfileInterface.cpp" line="438"/> + <location filename="../ProfileInterface.cpp" line="483"/> + <location filename="../ProfileInterface.cpp" line="536"/> + <location filename="../ProfileInterface.cpp" line="556"/> + <location filename="../ProfileInterface.cpp" line="572"/> + <location filename="../ProfileInterface.cpp" line="687"/> + <location filename="../ProfileInterface.cpp" line="767"/> + <location filename="../ProfileInterface.cpp" line="772"/> + <location filename="../ProfileInterface.cpp" line="783"/> + <location filename="../ProfileInterface.cpp" line="788"/> + <location filename="../ProfileInterface.cpp" line="800"/> + <location filename="../ProfileInterface.cpp" line="837"/> + <location filename="../ProfileInterface.cpp" line="843"/> <source>Import</source> <translation>Importieren</translation> </message> @@ -1367,13 +1377,13 @@ Drücke A für Standardansicht</translation> <translation type="vanished">Importfähige Dateien (*.g5e *.jpg *.png SGTA* PGTA*)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="434"/> + <location filename="../ProfileInterface.cpp" line="455"/> <location filename="../UserInterface.cpp" line="376"/> <source>Savegames files (SGTA*)</source> <translation>Spielstanddateien (SGTA*)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="435"/> + <location filename="../ProfileInterface.cpp" line="456"/> <location filename="../UserInterface.cpp" line="377"/> <source>Snapmatic pictures (PGTA*)</source> <translation>Snapmatic Bilder (PGTA*)</translation> @@ -1383,29 +1393,29 @@ Drücke A für Standardansicht</translation> <translation type="vanished">Alle Bilddateien (*.jpg *.png)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="432"/> + <location filename="../ProfileInterface.cpp" line="453"/> <source>Importable files (%1)</source> <translation>Importfähige Dateien (%1)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="436"/> + <location filename="../ProfileInterface.cpp" line="457"/> <source>All image files (%1)</source> <translation>Alle Bilddateien (%1)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="437"/> + <location filename="../ProfileInterface.cpp" line="458"/> <location filename="../UserInterface.cpp" line="378"/> <source>All files (**)</source> <translation>Alle Dateien (**)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="484"/> - <location filename="../ProfileInterface.cpp" line="499"/> + <location filename="../ProfileInterface.cpp" line="505"/> + <location filename="../ProfileInterface.cpp" line="520"/> <source>Import file %1 of %2 files</source> <translation>Importiere Datei %1 von %2 Dateien</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="515"/> + <location filename="../ProfileInterface.cpp" line="536"/> <source>Import failed with... %1</source> @@ -1414,29 +1424,29 @@ Drücke A für Standardansicht</translation> %1</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="535"/> + <location filename="../ProfileInterface.cpp" line="556"/> <location filename="../UserInterface.cpp" line="418"/> <source>Failed to read Snapmatic picture</source> <translation>Fehler beim Lesen vom Snapmatic Bild</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="551"/> + <location filename="../ProfileInterface.cpp" line="572"/> <location filename="../UserInterface.cpp" line="434"/> <source>Failed to read Savegame file</source> <translation>Fehler beim Lesen von Spielstanddatei</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="666"/> + <location filename="../ProfileInterface.cpp" line="687"/> <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> </message> <message> - <location filename="../ProfileInterface.cpp" line="746"/> + <location filename="../ProfileInterface.cpp" line="767"/> <source>Can't import %1 because file format can't be detected</source> <translation>Kann %1 nicht importieren weil das Dateiformat nicht erkannt werden kann</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="968"/> + <location filename="../ProfileInterface.cpp" line="991"/> <source>Initialising export...</source> <translation>Initialisiere Export...</translation> </message> @@ -1445,23 +1455,23 @@ Drücke A für Standardansicht</translation> <translation type="vanished">Kann %1 nicht importieren weil das Dateiformat nicht gültig ist</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="761"/> + <location filename="../ProfileInterface.cpp" line="783"/> <source>Failed to import the Snapmatic picture, file not begin with PGTA or end with .g5e</source> <translation>Fehlgeschlagen beim Importieren vom Snapmatic Bild, Datei beginnt nicht mit PGTA oder endet mit .g5e</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="766"/> + <location filename="../ProfileInterface.cpp" line="788"/> <source>Failed to import the Snapmatic picture, the picture is already in the game</source> <translation>Fehlgeschlagen beim Importieren vom Snapmatic Bild, dieses Bild ist bereits im Spiel</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="922"/> + <location filename="../ProfileInterface.cpp" line="945"/> <source>%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:</source> <translation>%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:</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="462"/> - <location filename="../ProfileInterface.cpp" line="751"/> + <location filename="../ProfileInterface.cpp" line="483"/> + <location filename="../ProfileInterface.cpp" line="772"/> <location filename="../UserInterface.cpp" line="466"/> <source>No valid file is selected</source> <translation>Keine gültige Datei wurde ausgewählt</translation> @@ -1476,35 +1486,35 @@ Drücke A für Standardansicht</translation> <translation type="vanished">Fehlgeschlagen beim Importieren vom Snapmatic Bild, Datei beginnt nicht mit PGTA</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="777"/> + <location filename="../ProfileInterface.cpp" line="800"/> <source>Failed to import the Snapmatic picture, can't copy the file into profile</source> <translation>Fehlgeschlagen beim Importieren vom Snapmatic Bild, kann Snapmatic Bild nicht ins Profil kopieren</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="814"/> + <location filename="../ProfileInterface.cpp" line="837"/> <source>Failed to import the Savegame, can't copy the file into profile</source> <translation>Fehlgeschlagen beim Importieren vom Spielstand, kann Spielstanddatei nicht ins Profil kopieren</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="820"/> + <location filename="../ProfileInterface.cpp" line="843"/> <source>Failed to import the Savegame, no Savegame slot is left</source> <translation>Fehlgeschlagen beim Importieren vom Spielstand, kein Spielstandslot mehr frei</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="907"/> - <location filename="../ProfileInterface.cpp" line="925"/> + <location filename="../ProfileInterface.cpp" line="930"/> + <location filename="../ProfileInterface.cpp" line="948"/> <source>JPG pictures and GTA Snapmatic</source> <translation>JPG Bilder und GTA Snapmatic</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="908"/> - <location filename="../ProfileInterface.cpp" line="930"/> + <location filename="../ProfileInterface.cpp" line="931"/> + <location filename="../ProfileInterface.cpp" line="953"/> <source>JPG pictures only</source> <translation>Nur JPG Bilder</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="909"/> - <location filename="../ProfileInterface.cpp" line="934"/> + <location filename="../ProfileInterface.cpp" line="932"/> + <location filename="../ProfileInterface.cpp" line="957"/> <source>GTA Snapmatic only</source> <translation>Nur GTA Snapmatic</translation> </message> @@ -1523,25 +1533,25 @@ Das GTA Snapmatic Format macht es möglich sie wieder ins Game zu importieren Exportieren als:</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1021"/> - <location filename="../ProfileInterface.cpp" line="1063"/> + <location filename="../ProfileInterface.cpp" line="1044"/> + <location filename="../ProfileInterface.cpp" line="1086"/> <source>No Snapmatic pictures or Savegames files are selected</source> <translation>Keine Snapmatic Bilder oder Spielstände ausgewählt</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1029"/> - <location filename="../ProfileInterface.cpp" line="1057"/> - <location filename="../ProfileInterface.cpp" line="1063"/> + <location filename="../ProfileInterface.cpp" line="1052"/> + <location filename="../ProfileInterface.cpp" line="1080"/> + <location filename="../ProfileInterface.cpp" line="1086"/> <source>Remove selected</source> <translation>Auswahl löschen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1029"/> + <location filename="../ProfileInterface.cpp" line="1052"/> <source>You really want remove the selected Snapmatic picutres and Savegame files?</source> <translation>Möchtest du wirklich die ausgewählten Snapmatic Bilder und Spielstanddateien löschen?</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1057"/> + <location filename="../ProfileInterface.cpp" line="1080"/> <source>Failed at remove the complete selected Snapmatic pictures and/or Savegame files</source> <translation>Fehlgeschlagen beim kompletten entfernen der ausgewählten Snapmatic Bilder und/oder der Spielstanddateien</translation> </message> @@ -1562,10 +1572,10 @@ Exportieren als:</translation> <translation type="obsolete">Fehlgeschlagenen beim Import vom Spielstand weil kein Spielstandslot mehr übrig ist</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="884"/> - <location filename="../ProfileInterface.cpp" line="922"/> - <location filename="../ProfileInterface.cpp" line="1001"/> - <location filename="../ProfileInterface.cpp" line="1021"/> + <location filename="../ProfileInterface.cpp" line="907"/> + <location filename="../ProfileInterface.cpp" line="945"/> + <location filename="../ProfileInterface.cpp" line="1024"/> + <location filename="../ProfileInterface.cpp" line="1044"/> <source>Export selected</source> <translation>Auswahl exportieren</translation> </message> @@ -1586,7 +1596,7 @@ Exportieren als:</translation> <translation type="obsolete">Wie sollen wir mit den Snapmatic Bilder umgehen?</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="967"/> + <location filename="../ProfileInterface.cpp" line="990"/> <source>Export selected...</source> <translation>Auswahl exportieren...</translation> </message> @@ -1599,7 +1609,7 @@ Exportieren als:</translation> <translation type="obsolete">Initialisierung...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1001"/> + <location filename="../ProfileInterface.cpp" line="1024"/> <source>Export failed with... %1</source> @@ -1634,7 +1644,7 @@ Exportieren als:</translation> <translation>Alle Profildateien (*.g5e SGTA* PGTA*)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="433"/> + <location filename="../ProfileInterface.cpp" line="454"/> <location filename="../UserInterface.cpp" line="375"/> <source>GTA V Export (*.g5e)</source> <translation>GTA V Export (*.g5e)</translation> @@ -1803,32 +1813,32 @@ Exportieren als:</translation> <translation>Fehlgeschlagen beim Löschen %1 von deinen Spielständen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1205"/> + <location filename="../ProfileInterface.cpp" line="1228"/> <source>&View</source> <translation>A&nsehen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1207"/> + <location filename="../ProfileInterface.cpp" line="1230"/> <source>&Remove</source> <translation>Entfe&rnen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1209"/> + <location filename="../ProfileInterface.cpp" line="1232"/> <source>&Select</source> <translation>Au&swählen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1210"/> + <location filename="../ProfileInterface.cpp" line="1233"/> <source>&Deselect</source> <translation>A&bwählen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1213"/> + <location filename="../ProfileInterface.cpp" line="1236"/> <source>Select &All</source> <translation>&Alles auswählen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1217"/> + <location filename="../ProfileInterface.cpp" line="1240"/> <source>&Deselect All</source> <translation>Alles a&bwählen</translation> </message> @@ -1867,7 +1877,7 @@ Exportieren als:</translation> <translation>Spielstand kopieren</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1206"/> + <location filename="../ProfileInterface.cpp" line="1229"/> <source>&Export</source> <translation>&Exportieren</translation> </message> @@ -2110,7 +2120,7 @@ Exportieren als:</translation> <context> <name>SnapmaticPicture</name> <message> - <location filename="../SnapmaticPicture.cpp" line="417"/> + <location filename="../SnapmaticPicture.cpp" line="440"/> <source>PHOTO - %1</source> <translation>FOTO - %1</translation> </message> @@ -2160,7 +2170,7 @@ Exportieren als:</translation> <translation>Bist du sicher %1 von deine Snapmatic Bilder zu löschen?</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1155"/> + <location filename="../ProfileInterface.cpp" line="1178"/> <source>Edi&t</source> <translation>Bearbei&ten</translation> </message> @@ -2173,7 +2183,7 @@ Exportieren als:</translation> <translation type="vanished">&Im Spiel deaktivieren</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1168"/> + <location filename="../ProfileInterface.cpp" line="1191"/> <source>&Export</source> <translation>&Exportieren</translation> </message> @@ -2186,12 +2196,12 @@ Exportieren als:</translation> <translation type="obsolete">Exportiere als &GTA Snapmatic</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1158"/> + <location filename="../ProfileInterface.cpp" line="1181"/> <source>Show &In-game</source> <translation>&Im Spiel anzeigen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1162"/> + <location filename="../ProfileInterface.cpp" line="1185"/> <source>Hide &In-game</source> <translation>&Im Spiel ausblenden</translation> </message> @@ -2224,32 +2234,32 @@ Exportieren als:</translation> <translation type="vanished">Exportiere als &Snapmatic...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1171"/> + <location filename="../ProfileInterface.cpp" line="1194"/> <source>&View</source> <translation>A&nsehen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1174"/> + <location filename="../ProfileInterface.cpp" line="1197"/> <source>&Remove</source> <translation>Entfe&rnen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1176"/> + <location filename="../ProfileInterface.cpp" line="1199"/> <source>&Select</source> <translation>Au&swählen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1177"/> + <location filename="../ProfileInterface.cpp" line="1200"/> <source>&Deselect</source> <translation>A&bwählen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1180"/> + <location filename="../ProfileInterface.cpp" line="1203"/> <source>Select &All</source> <translation>Alles &auswählen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1184"/> + <location filename="../ProfileInterface.cpp" line="1207"/> <source>&Deselect All</source> <translation>Alles a&bwählen</translation> </message> 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</source> </message> <message> <location filename="../ImportDialog.cpp" line="105"/> - <location filename="../ProfileInterface.cpp" line="599"/> + <location filename="../ProfileInterface.cpp" line="620"/> <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="131"/> - <location filename="../ProfileInterface.cpp" line="618"/> + <location filename="../ProfileInterface.cpp" line="639"/> <source>Custom Picture</source> <comment>Custom Picture Description in SC, don't use Special Character!</comment> <translation type="unfinished"></translation> @@ -624,25 +624,25 @@ Y: %2</source> </message> <message> <location filename="../PictureDialog.cpp" line="148"/> - <location filename="../ProfileInterface.cpp" line="1169"/> + <location filename="../ProfileInterface.cpp" line="1192"/> <source>Export as &Picture...</source> <translation></translation> </message> <message> <location filename="../PictureDialog.cpp" line="149"/> - <location filename="../ProfileInterface.cpp" line="1170"/> + <location filename="../ProfileInterface.cpp" line="1193"/> <source>Export as &Snapmatic...</source> <translation></translation> </message> <message> <location filename="../PictureDialog.cpp" line="151"/> - <location filename="../ProfileInterface.cpp" line="1164"/> + <location filename="../ProfileInterface.cpp" line="1187"/> <source>&Edit Properties...</source> <translation></translation> </message> <message> <location filename="../PictureDialog.cpp" line="153"/> - <location filename="../ProfileInterface.cpp" line="1166"/> + <location filename="../ProfileInterface.cpp" line="1189"/> <source>Open &Map Viewer...</source> <translation type="unfinished"></translation> </message> @@ -793,7 +793,7 @@ Press 1 for Default View</source> </message> <message> <location filename="../PictureDialog.cpp" line="155"/> - <location filename="../ProfileInterface.cpp" line="1167"/> + <location filename="../ProfileInterface.cpp" line="1190"/> <source>Open &JSON Editor...</source> <translation type="unfinished"></translation> </message> @@ -848,202 +848,212 @@ Press 1 for Default View</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="134"/> + <location filename="../ProfileInterface.cpp" line="135"/> <source>Loading...</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="416"/> - <location filename="../ProfileInterface.cpp" line="483"/> + <location filename="../ProfileInterface.cpp" line="364"/> + <source>Snapmatic Loader</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ProfileInterface.cpp" line="364"/> + <source><h4>Following Snapmatic Pictures got repaired</h4>%1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ProfileInterface.cpp" line="437"/> + <location filename="../ProfileInterface.cpp" line="504"/> <source>Import...</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="417"/> - <location filename="../ProfileInterface.cpp" line="462"/> - <location filename="../ProfileInterface.cpp" line="515"/> - <location filename="../ProfileInterface.cpp" line="535"/> - <location filename="../ProfileInterface.cpp" line="551"/> - <location filename="../ProfileInterface.cpp" line="666"/> - <location filename="../ProfileInterface.cpp" line="746"/> - <location filename="../ProfileInterface.cpp" line="751"/> - <location filename="../ProfileInterface.cpp" line="761"/> - <location filename="../ProfileInterface.cpp" line="766"/> - <location filename="../ProfileInterface.cpp" line="777"/> - <location filename="../ProfileInterface.cpp" line="814"/> - <location filename="../ProfileInterface.cpp" line="820"/> + <location filename="../ProfileInterface.cpp" line="438"/> + <location filename="../ProfileInterface.cpp" line="483"/> + <location filename="../ProfileInterface.cpp" line="536"/> + <location filename="../ProfileInterface.cpp" line="556"/> + <location filename="../ProfileInterface.cpp" line="572"/> + <location filename="../ProfileInterface.cpp" line="687"/> + <location filename="../ProfileInterface.cpp" line="767"/> + <location filename="../ProfileInterface.cpp" line="772"/> + <location filename="../ProfileInterface.cpp" line="783"/> + <location filename="../ProfileInterface.cpp" line="788"/> + <location filename="../ProfileInterface.cpp" line="800"/> + <location filename="../ProfileInterface.cpp" line="837"/> + <location filename="../ProfileInterface.cpp" line="843"/> <source>Import</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="432"/> + <location filename="../ProfileInterface.cpp" line="453"/> <source>Importable files (%1)</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="433"/> + <location filename="../ProfileInterface.cpp" line="454"/> <location filename="../UserInterface.cpp" line="375"/> <source>GTA V Export (*.g5e)</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="434"/> + <location filename="../ProfileInterface.cpp" line="455"/> <location filename="../UserInterface.cpp" line="376"/> <source>Savegames files (SGTA*)</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="435"/> + <location filename="../ProfileInterface.cpp" line="456"/> <location filename="../UserInterface.cpp" line="377"/> <source>Snapmatic pictures (PGTA*)</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="436"/> + <location filename="../ProfileInterface.cpp" line="457"/> <source>All image files (%1)</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="437"/> + <location filename="../ProfileInterface.cpp" line="458"/> <location filename="../UserInterface.cpp" line="378"/> <source>All files (**)</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="462"/> - <location filename="../ProfileInterface.cpp" line="751"/> + <location filename="../ProfileInterface.cpp" line="483"/> + <location filename="../ProfileInterface.cpp" line="772"/> <location filename="../UserInterface.cpp" line="466"/> <source>No valid file is selected</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="484"/> - <location filename="../ProfileInterface.cpp" line="499"/> + <location filename="../ProfileInterface.cpp" line="505"/> + <location filename="../ProfileInterface.cpp" line="520"/> <source>Import file %1 of %2 files</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="515"/> + <location filename="../ProfileInterface.cpp" line="536"/> <source>Import failed with... %1</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="535"/> + <location filename="../ProfileInterface.cpp" line="556"/> <location filename="../UserInterface.cpp" line="418"/> <source>Failed to read Snapmatic picture</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="551"/> + <location filename="../ProfileInterface.cpp" line="572"/> <location filename="../UserInterface.cpp" line="434"/> <source>Failed to read Savegame file</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="666"/> + <location filename="../ProfileInterface.cpp" line="687"/> <source>Can't import %1 because file can't be parsed properly</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="746"/> + <location filename="../ProfileInterface.cpp" line="767"/> <source>Can't import %1 because file format can't be detected</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="761"/> + <location filename="../ProfileInterface.cpp" line="783"/> <source>Failed to import the Snapmatic picture, file not begin with PGTA or end with .g5e</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="766"/> + <location filename="../ProfileInterface.cpp" line="788"/> <source>Failed to import the Snapmatic picture, the picture is already in the game</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="777"/> + <location filename="../ProfileInterface.cpp" line="800"/> <source>Failed to import the Snapmatic picture, can't copy the file into profile</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="814"/> + <location filename="../ProfileInterface.cpp" line="837"/> <source>Failed to import the Savegame, can't copy the file into profile</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="820"/> + <location filename="../ProfileInterface.cpp" line="843"/> <source>Failed to import the Savegame, no Savegame slot is left</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="884"/> - <location filename="../ProfileInterface.cpp" line="922"/> - <location filename="../ProfileInterface.cpp" line="1001"/> - <location filename="../ProfileInterface.cpp" line="1021"/> + <location filename="../ProfileInterface.cpp" line="907"/> + <location filename="../ProfileInterface.cpp" line="945"/> + <location filename="../ProfileInterface.cpp" line="1024"/> + <location filename="../ProfileInterface.cpp" line="1044"/> <source>Export selected</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="907"/> - <location filename="../ProfileInterface.cpp" line="925"/> + <location filename="../ProfileInterface.cpp" line="930"/> + <location filename="../ProfileInterface.cpp" line="948"/> <source>JPG pictures and GTA Snapmatic</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="908"/> - <location filename="../ProfileInterface.cpp" line="930"/> + <location filename="../ProfileInterface.cpp" line="931"/> + <location filename="../ProfileInterface.cpp" line="953"/> <source>JPG pictures only</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="909"/> - <location filename="../ProfileInterface.cpp" line="934"/> + <location filename="../ProfileInterface.cpp" line="932"/> + <location filename="../ProfileInterface.cpp" line="957"/> <source>GTA Snapmatic only</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="922"/> + <location filename="../ProfileInterface.cpp" line="945"/> <source>%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:</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="967"/> + <location filename="../ProfileInterface.cpp" line="990"/> <source>Export selected...</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="968"/> + <location filename="../ProfileInterface.cpp" line="991"/> <source>Initialising export...</source> <translation>Initializing export...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1001"/> + <location filename="../ProfileInterface.cpp" line="1024"/> <source>Export failed with... %1</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1021"/> - <location filename="../ProfileInterface.cpp" line="1063"/> + <location filename="../ProfileInterface.cpp" line="1044"/> + <location filename="../ProfileInterface.cpp" line="1086"/> <source>No Snapmatic pictures or Savegames files are selected</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1029"/> - <location filename="../ProfileInterface.cpp" line="1057"/> - <location filename="../ProfileInterface.cpp" line="1063"/> + <location filename="../ProfileInterface.cpp" line="1052"/> + <location filename="../ProfileInterface.cpp" line="1080"/> + <location filename="../ProfileInterface.cpp" line="1086"/> <source>Remove selected</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1029"/> + <location filename="../ProfileInterface.cpp" line="1052"/> <source>You really want remove the selected Snapmatic picutres and Savegame files?</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1057"/> + <location filename="../ProfileInterface.cpp" line="1080"/> <source>Failed at remove the complete selected Snapmatic pictures and/or Savegame files</source> <translation></translation> </message> @@ -1144,37 +1154,37 @@ Press 1 for Default View</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1205"/> + <location filename="../ProfileInterface.cpp" line="1228"/> <source>&View</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1206"/> + <location filename="../ProfileInterface.cpp" line="1229"/> <source>&Export</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1207"/> + <location filename="../ProfileInterface.cpp" line="1230"/> <source>&Remove</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1209"/> + <location filename="../ProfileInterface.cpp" line="1232"/> <source>&Select</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1210"/> + <location filename="../ProfileInterface.cpp" line="1233"/> <source>&Deselect</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1213"/> + <location filename="../ProfileInterface.cpp" line="1236"/> <source>Select &All</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1217"/> + <location filename="../ProfileInterface.cpp" line="1240"/> <source>&Deselect All</source> <translation></translation> </message> @@ -1423,7 +1433,7 @@ Press 1 for Default View</source> <context> <name>SnapmaticPicture</name> <message> - <location filename="../SnapmaticPicture.cpp" line="417"/> + <location filename="../SnapmaticPicture.cpp" line="440"/> <source>PHOTO - %1</source> <translation></translation> </message> @@ -1483,52 +1493,52 @@ Press 1 for Default View</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1155"/> + <location filename="../ProfileInterface.cpp" line="1178"/> <source>Edi&t</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1158"/> + <location filename="../ProfileInterface.cpp" line="1181"/> <source>Show &In-game</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1162"/> + <location filename="../ProfileInterface.cpp" line="1185"/> <source>Hide &In-game</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1168"/> + <location filename="../ProfileInterface.cpp" line="1191"/> <source>&Export</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1171"/> + <location filename="../ProfileInterface.cpp" line="1194"/> <source>&View</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1174"/> + <location filename="../ProfileInterface.cpp" line="1197"/> <source>&Remove</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1176"/> + <location filename="../ProfileInterface.cpp" line="1199"/> <source>&Select</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1177"/> + <location filename="../ProfileInterface.cpp" line="1200"/> <source>&Deselect</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1180"/> + <location filename="../ProfileInterface.cpp" line="1203"/> <source>Select &All</source> <translation></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1184"/> + <location filename="../ProfileInterface.cpp" line="1207"/> <source>&Deselect All</source> <translation></translation> </message> 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</translation> </message> <message> <location filename="../ImportDialog.cpp" line="105"/> - <location filename="../ProfileInterface.cpp" line="599"/> + <location filename="../ProfileInterface.cpp" line="620"/> <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="131"/> - <location filename="../ProfileInterface.cpp" line="618"/> + <location filename="../ProfileInterface.cpp" line="639"/> <source>Custom Picture</source> <comment>Custom Picture Description in SC, don't use Special Character!</comment> <translation type="unfinished"></translation> @@ -903,7 +903,7 @@ Y: %2</source> </message> <message> <location filename="../PictureDialog.cpp" line="148"/> - <location filename="../ProfileInterface.cpp" line="1169"/> + <location filename="../ProfileInterface.cpp" line="1192"/> <source>Export as &Picture...</source> <translation type="unfinished"></translation> </message> @@ -913,7 +913,7 @@ Y: %2</source> </message> <message> <location filename="../PictureDialog.cpp" line="149"/> - <location filename="../ProfileInterface.cpp" line="1170"/> + <location filename="../ProfileInterface.cpp" line="1193"/> <source>Export as &Snapmatic...</source> <translation type="unfinished"></translation> </message> @@ -923,13 +923,13 @@ Y: %2</source> </message> <message> <location filename="../PictureDialog.cpp" line="151"/> - <location filename="../ProfileInterface.cpp" line="1164"/> + <location filename="../ProfileInterface.cpp" line="1187"/> <source>&Edit Properties...</source> <translation>Modifier les &propriétés...</translation> </message> <message> <location filename="../PictureDialog.cpp" line="153"/> - <location filename="../ProfileInterface.cpp" line="1166"/> + <location filename="../ProfileInterface.cpp" line="1189"/> <source>Open &Map Viewer...</source> <translation type="unfinished"></translation> </message> @@ -1021,7 +1021,7 @@ Appuyer sur 1 pour le mode par défaut</translation> </message> <message> <location filename="../PictureDialog.cpp" line="155"/> - <location filename="../ProfileInterface.cpp" line="1167"/> + <location filename="../ProfileInterface.cpp" line="1190"/> <source>Open &JSON Editor...</source> <translation type="unfinished"></translation> </message> @@ -1080,30 +1080,40 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation>Photos activées : %1 sur %2</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="134"/> + <location filename="../ProfileInterface.cpp" line="135"/> <source>Loading...</source> <translation>Chargement...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="416"/> - <location filename="../ProfileInterface.cpp" line="483"/> + <location filename="../ProfileInterface.cpp" line="364"/> + <source>Snapmatic Loader</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ProfileInterface.cpp" line="364"/> + <source><h4>Following Snapmatic Pictures got repaired</h4>%1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ProfileInterface.cpp" line="437"/> + <location filename="../ProfileInterface.cpp" line="504"/> <source>Import...</source> <translation>Importer...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="417"/> - <location filename="../ProfileInterface.cpp" line="462"/> - <location filename="../ProfileInterface.cpp" line="515"/> - <location filename="../ProfileInterface.cpp" line="535"/> - <location filename="../ProfileInterface.cpp" line="551"/> - <location filename="../ProfileInterface.cpp" line="666"/> - <location filename="../ProfileInterface.cpp" line="746"/> - <location filename="../ProfileInterface.cpp" line="751"/> - <location filename="../ProfileInterface.cpp" line="761"/> - <location filename="../ProfileInterface.cpp" line="766"/> - <location filename="../ProfileInterface.cpp" line="777"/> - <location filename="../ProfileInterface.cpp" line="814"/> - <location filename="../ProfileInterface.cpp" line="820"/> + <location filename="../ProfileInterface.cpp" line="438"/> + <location filename="../ProfileInterface.cpp" line="483"/> + <location filename="../ProfileInterface.cpp" line="536"/> + <location filename="../ProfileInterface.cpp" line="556"/> + <location filename="../ProfileInterface.cpp" line="572"/> + <location filename="../ProfileInterface.cpp" line="687"/> + <location filename="../ProfileInterface.cpp" line="767"/> + <location filename="../ProfileInterface.cpp" line="772"/> + <location filename="../ProfileInterface.cpp" line="783"/> + <location filename="../ProfileInterface.cpp" line="788"/> + <location filename="../ProfileInterface.cpp" line="800"/> + <location filename="../ProfileInterface.cpp" line="837"/> + <location filename="../ProfileInterface.cpp" line="843"/> <source>Import</source> <translation>Importer</translation> </message> @@ -1112,36 +1122,36 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation type="vanished">Fichiers de profil GTA (SGTA* PGTA*)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="434"/> + <location filename="../ProfileInterface.cpp" line="455"/> <location filename="../UserInterface.cpp" line="376"/> <source>Savegames files (SGTA*)</source> <translation>Fichiers de sauvegarde GTA (SGTA*)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="435"/> + <location filename="../ProfileInterface.cpp" line="456"/> <location filename="../UserInterface.cpp" line="377"/> <source>Snapmatic pictures (PGTA*)</source> <translation>Photos Snapmatic (PGTA*)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="436"/> + <location filename="../ProfileInterface.cpp" line="457"/> <source>All image files (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="437"/> + <location filename="../ProfileInterface.cpp" line="458"/> <location filename="../UserInterface.cpp" line="378"/> <source>All files (**)</source> <translation>Tous les fichiers (**)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="484"/> - <location filename="../ProfileInterface.cpp" line="499"/> + <location filename="../ProfileInterface.cpp" line="505"/> + <location filename="../ProfileInterface.cpp" line="520"/> <source>Import file %1 of %2 files</source> <translation>Importation du fichier %1 sur %2</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="515"/> + <location filename="../ProfileInterface.cpp" line="536"/> <source>Import failed with... %1</source> @@ -1150,25 +1160,25 @@ Appuyer sur 1 pour le mode par défaut</translation> %1</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="462"/> - <location filename="../ProfileInterface.cpp" line="751"/> + <location filename="../ProfileInterface.cpp" line="483"/> + <location filename="../ProfileInterface.cpp" line="772"/> <location filename="../UserInterface.cpp" line="466"/> <source>No valid file is selected</source> <translation>Fichier invalide</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="432"/> + <location filename="../ProfileInterface.cpp" line="453"/> <source>Importable files (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="535"/> + <location filename="../ProfileInterface.cpp" line="556"/> <location filename="../UserInterface.cpp" line="418"/> <source>Failed to read Snapmatic picture</source> <translation>Impossible d'ouvrir la photo Snapmatic</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="551"/> + <location filename="../ProfileInterface.cpp" line="572"/> <location filename="../UserInterface.cpp" line="434"/> <source>Failed to read Savegame file</source> <translation>Impossible de lire le fichier de sauvegarde</translation> @@ -1190,78 +1200,78 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation type="vanished">Tous les fichiers image (*.jpg *.png)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="666"/> + <location filename="../ProfileInterface.cpp" line="687"/> <source>Can't import %1 because file can't be parsed properly</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="746"/> + <location filename="../ProfileInterface.cpp" line="767"/> <source>Can't import %1 because file format can't be detected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="761"/> + <location filename="../ProfileInterface.cpp" line="783"/> <source>Failed to import the Snapmatic picture, file not begin with PGTA or end with .g5e</source> <translation>Impossible d'importer la photo Snapmatic,nom de fichier incorrect (PGTA*, *.g5e)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="766"/> + <location filename="../ProfileInterface.cpp" line="788"/> <source>Failed to import the Snapmatic picture, the picture is already in the game</source> <translation>Impossible d'importer la photo Snapmatic, un fichier du même nom existe déjà</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="777"/> + <location filename="../ProfileInterface.cpp" line="800"/> <source>Failed to import the Snapmatic picture, can't copy the file into profile</source> <translation>Impossible d'importer la photo Snapmatic, impossible de copier le fichier dans le profil</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="814"/> + <location filename="../ProfileInterface.cpp" line="837"/> <source>Failed to import the Savegame, can't copy the file into profile</source> <translation>Impossible d'importer la sauvegarde, impossible de copier le fichier dans le profil</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="820"/> + <location filename="../ProfileInterface.cpp" line="843"/> <source>Failed to import the Savegame, no Savegame slot is left</source> <translation>Impossible d'importer la sauvegarde, aucun emplacement libre</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="884"/> - <location filename="../ProfileInterface.cpp" line="922"/> - <location filename="../ProfileInterface.cpp" line="1001"/> - <location filename="../ProfileInterface.cpp" line="1021"/> + <location filename="../ProfileInterface.cpp" line="907"/> + <location filename="../ProfileInterface.cpp" line="945"/> + <location filename="../ProfileInterface.cpp" line="1024"/> + <location filename="../ProfileInterface.cpp" line="1044"/> <source>Export selected</source> <translation>Exporter la sélection</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="907"/> - <location filename="../ProfileInterface.cpp" line="925"/> + <location filename="../ProfileInterface.cpp" line="930"/> + <location filename="../ProfileInterface.cpp" line="948"/> <source>JPG pictures and GTA Snapmatic</source> <translation>Images JPG et GTA Snapmatic</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="908"/> - <location filename="../ProfileInterface.cpp" line="930"/> + <location filename="../ProfileInterface.cpp" line="931"/> + <location filename="../ProfileInterface.cpp" line="953"/> <source>JPG pictures only</source> <translation>Images JPG seulement</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="909"/> - <location filename="../ProfileInterface.cpp" line="934"/> + <location filename="../ProfileInterface.cpp" line="932"/> + <location filename="../ProfileInterface.cpp" line="957"/> <source>GTA Snapmatic only</source> <translation>GTA Snapmatic seulement</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="922"/> + <location filename="../ProfileInterface.cpp" line="945"/> <source>%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:</source> <translation>%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 :</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="967"/> + <location filename="../ProfileInterface.cpp" line="990"/> <source>Export selected...</source> <translation>Exporter la sélection...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="968"/> + <location filename="../ProfileInterface.cpp" line="991"/> <source>Initialising export...</source> <translation type="unfinished"></translation> </message> @@ -1270,7 +1280,7 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation type="vanished">Initialisation de l'export...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1001"/> + <location filename="../ProfileInterface.cpp" line="1024"/> <source>Export failed with... %1</source> @@ -1279,25 +1289,25 @@ Appuyer sur 1 pour le mode par défaut</translation> %1</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1021"/> - <location filename="../ProfileInterface.cpp" line="1063"/> + <location filename="../ProfileInterface.cpp" line="1044"/> + <location filename="../ProfileInterface.cpp" line="1086"/> <source>No Snapmatic pictures or Savegames files are selected</source> <translation>Aucun fichier de sauvegarde ou photo Snapmatic sélectionné</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1029"/> - <location filename="../ProfileInterface.cpp" line="1057"/> - <location filename="../ProfileInterface.cpp" line="1063"/> + <location filename="../ProfileInterface.cpp" line="1052"/> + <location filename="../ProfileInterface.cpp" line="1080"/> + <location filename="../ProfileInterface.cpp" line="1086"/> <source>Remove selected</source> <translation>Supprimer la sélection</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1029"/> + <location filename="../ProfileInterface.cpp" line="1052"/> <source>You really want remove the selected Snapmatic picutres and Savegame files?</source> <translation>Supprimer la sélection ?</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1057"/> + <location filename="../ProfileInterface.cpp" line="1080"/> <source>Failed at remove the complete selected Snapmatic pictures and/or Savegame files</source> <translation>Impossible de supprimer la sélection</translation> </message> @@ -1307,7 +1317,7 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation>Tous les fichiers de profil (*.g5e SGTA* PGTA*)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="433"/> + <location filename="../ProfileInterface.cpp" line="454"/> <location filename="../UserInterface.cpp" line="375"/> <source>GTA V Export (*.g5e)</source> <translation>GTA V Export (*.g5e)</translation> @@ -1404,7 +1414,7 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation>Supprimer</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1206"/> + <location filename="../ProfileInterface.cpp" line="1229"/> <source>&Export</source> <translation>&Exporter</translation> </message> @@ -1495,32 +1505,32 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation>Impossible de supprimer %1</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1205"/> + <location filename="../ProfileInterface.cpp" line="1228"/> <source>&View</source> <translation>&Voir</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1207"/> + <location filename="../ProfileInterface.cpp" line="1230"/> <source>&Remove</source> <translation>&Supprimer</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1209"/> + <location filename="../ProfileInterface.cpp" line="1232"/> <source>&Select</source> <translation>&Sélectionner</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1210"/> + <location filename="../ProfileInterface.cpp" line="1233"/> <source>&Deselect</source> <translation>&Déselectionner</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1213"/> + <location filename="../ProfileInterface.cpp" line="1236"/> <source>Select &All</source> <translation>Sélectionner to&ut</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1217"/> + <location filename="../ProfileInterface.cpp" line="1240"/> <source>&Deselect All</source> <translation>&Déselectionner tout</translation> </message> @@ -1691,7 +1701,7 @@ Appuyer sur 1 pour le mode par défaut</translation> <context> <name>SnapmaticPicture</name> <message> - <location filename="../SnapmaticPicture.cpp" line="417"/> + <location filename="../SnapmaticPicture.cpp" line="440"/> <source>PHOTO - %1</source> <translation>PHOTO - %1</translation> </message> @@ -1761,17 +1771,17 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation>Impossible de supprimer %1</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1155"/> + <location filename="../ProfileInterface.cpp" line="1178"/> <source>Edi&t</source> <translation>Édi&ter</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1158"/> + <location filename="../ProfileInterface.cpp" line="1181"/> <source>Show &In-game</source> <translation>&Visible en jeu</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1162"/> + <location filename="../ProfileInterface.cpp" line="1185"/> <source>Hide &In-game</source> <translation>&Invisible en jeu</translation> </message> @@ -1780,7 +1790,7 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation type="vanished">Modifier les &propriétés...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1168"/> + <location filename="../ProfileInterface.cpp" line="1191"/> <source>&Export</source> <translation>&Exporter</translation> </message> @@ -1793,32 +1803,32 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation type="vanished">Exporter comme &GTA Snapmatic...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1171"/> + <location filename="../ProfileInterface.cpp" line="1194"/> <source>&View</source> <translation>&Voir</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1174"/> + <location filename="../ProfileInterface.cpp" line="1197"/> <source>&Remove</source> <translation>S&upprimer</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1176"/> + <location filename="../ProfileInterface.cpp" line="1199"/> <source>&Select</source> <translation>&Sélectionner</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1177"/> + <location filename="../ProfileInterface.cpp" line="1200"/> <source>&Deselect</source> <translation>&Déselectionner</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1180"/> + <location filename="../ProfileInterface.cpp" line="1203"/> <source>Select &All</source> <translation>Sélectionner &tout</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1184"/> + <location filename="../ProfileInterface.cpp" line="1207"/> <source>&Deselect All</source> <translation>&Déselectionner tout</translation> </message> 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 картинок и сохранений</translati </message> <message> <location filename="../ImportDialog.cpp" line="105"/> - <location filename="../ProfileInterface.cpp" line="599"/> + <location filename="../ProfileInterface.cpp" line="620"/> <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="131"/> - <location filename="../ProfileInterface.cpp" line="618"/> + <location filename="../ProfileInterface.cpp" line="639"/> <source>Custom Picture</source> <comment>Custom Picture Description in SC, don't use Special Character!</comment> <translation type="unfinished"></translation> @@ -782,7 +782,7 @@ Y: %2</translation> </message> <message> <location filename="../PictureDialog.cpp" line="148"/> - <location filename="../ProfileInterface.cpp" line="1169"/> + <location filename="../ProfileInterface.cpp" line="1192"/> <source>Export as &Picture...</source> <translation>Экспортировать как &картинку...</translation> </message> @@ -792,7 +792,7 @@ Y: %2</translation> </message> <message> <location filename="../PictureDialog.cpp" line="149"/> - <location filename="../ProfileInterface.cpp" line="1170"/> + <location filename="../ProfileInterface.cpp" line="1193"/> <source>Export as &Snapmatic...</source> <translation>Экспортировать как &Snapmatic...</translation> </message> @@ -806,13 +806,13 @@ Y: %2</translation> </message> <message> <location filename="../PictureDialog.cpp" line="151"/> - <location filename="../ProfileInterface.cpp" line="1164"/> + <location filename="../ProfileInterface.cpp" line="1187"/> <source>&Edit Properties...</source> <translation>&Изменить свойства...</translation> </message> <message> <location filename="../PictureDialog.cpp" line="153"/> - <location filename="../ProfileInterface.cpp" line="1166"/> + <location filename="../ProfileInterface.cpp" line="1189"/> <source>Open &Map Viewer...</source> <translation type="unfinished"></translation> </message> @@ -1004,7 +1004,7 @@ Press 1 for Default View</source> </message> <message> <location filename="../PictureDialog.cpp" line="155"/> - <location filename="../ProfileInterface.cpp" line="1167"/> + <location filename="../ProfileInterface.cpp" line="1190"/> <source>Open &JSON Editor...</source> <translation type="unfinished"></translation> </message> @@ -1059,30 +1059,40 @@ Press 1 for Default View</source> <translation type="obsolete">Закрыть профиль</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="134"/> + <location filename="../ProfileInterface.cpp" line="135"/> <source>Loading...</source> <translation>Загрузка...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="416"/> - <location filename="../ProfileInterface.cpp" line="483"/> + <location filename="../ProfileInterface.cpp" line="364"/> + <source>Snapmatic Loader</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ProfileInterface.cpp" line="364"/> + <source><h4>Following Snapmatic Pictures got repaired</h4>%1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ProfileInterface.cpp" line="437"/> + <location filename="../ProfileInterface.cpp" line="504"/> <source>Import...</source> <translation>Импортировать...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="417"/> - <location filename="../ProfileInterface.cpp" line="462"/> - <location filename="../ProfileInterface.cpp" line="515"/> - <location filename="../ProfileInterface.cpp" line="535"/> - <location filename="../ProfileInterface.cpp" line="551"/> - <location filename="../ProfileInterface.cpp" line="666"/> - <location filename="../ProfileInterface.cpp" line="746"/> - <location filename="../ProfileInterface.cpp" line="751"/> - <location filename="../ProfileInterface.cpp" line="761"/> - <location filename="../ProfileInterface.cpp" line="766"/> - <location filename="../ProfileInterface.cpp" line="777"/> - <location filename="../ProfileInterface.cpp" line="814"/> - <location filename="../ProfileInterface.cpp" line="820"/> + <location filename="../ProfileInterface.cpp" line="438"/> + <location filename="../ProfileInterface.cpp" line="483"/> + <location filename="../ProfileInterface.cpp" line="536"/> + <location filename="../ProfileInterface.cpp" line="556"/> + <location filename="../ProfileInterface.cpp" line="572"/> + <location filename="../ProfileInterface.cpp" line="687"/> + <location filename="../ProfileInterface.cpp" line="767"/> + <location filename="../ProfileInterface.cpp" line="772"/> + <location filename="../ProfileInterface.cpp" line="783"/> + <location filename="../ProfileInterface.cpp" line="788"/> + <location filename="../ProfileInterface.cpp" line="800"/> + <location filename="../ProfileInterface.cpp" line="837"/> + <location filename="../ProfileInterface.cpp" line="843"/> <source>Import</source> <translation>Импортировать</translation> </message> @@ -1091,31 +1101,31 @@ Press 1 for Default View</source> <translation type="vanished">Все файлы профиля (SGTA* PGTA*)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="434"/> + <location filename="../ProfileInterface.cpp" line="455"/> <location filename="../UserInterface.cpp" line="376"/> <source>Savegames files (SGTA*)</source> <translation>Файлы сохранения (SGTA*)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="435"/> + <location filename="../ProfileInterface.cpp" line="456"/> <location filename="../UserInterface.cpp" line="377"/> <source>Snapmatic pictures (PGTA*)</source> <translation>Картинка Snapmatic (PGTA*)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="437"/> + <location filename="../ProfileInterface.cpp" line="458"/> <location filename="../UserInterface.cpp" line="378"/> <source>All files (**)</source> <translation>Все файлы (**)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="484"/> - <location filename="../ProfileInterface.cpp" line="499"/> + <location filename="../ProfileInterface.cpp" line="505"/> + <location filename="../ProfileInterface.cpp" line="520"/> <source>Import file %1 of %2 files</source> <translation>Импортируются файлы %1 из %2</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="515"/> + <location filename="../ProfileInterface.cpp" line="536"/> <source>Import failed with... %1</source> @@ -1124,13 +1134,13 @@ Press 1 for Default View</source> %1</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="535"/> + <location filename="../ProfileInterface.cpp" line="556"/> <location filename="../UserInterface.cpp" line="418"/> <source>Failed to read Snapmatic picture</source> <translation>Не удалось загрузить картинку Snapmatic</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="551"/> + <location filename="../ProfileInterface.cpp" line="572"/> <location filename="../UserInterface.cpp" line="434"/> <source>Failed to read Savegame file</source> <translation>Не удалось загрузить файл сохранения</translation> @@ -1140,8 +1150,8 @@ Press 1 for Default View</source> <translation type="vanished">Не получилось импортировать %1 из-за неправильного формата файла</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="462"/> - <location filename="../ProfileInterface.cpp" line="751"/> + <location filename="../ProfileInterface.cpp" line="483"/> + <location filename="../ProfileInterface.cpp" line="772"/> <location filename="../UserInterface.cpp" line="466"/> <source>No valid file is selected</source> <translation>Выбранный файл неверен</translation> @@ -1160,93 +1170,93 @@ Press 1 for Default View</source> <translation type="vanished">Все изображения (*.jpg *.png)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="432"/> + <location filename="../ProfileInterface.cpp" line="453"/> <source>Importable files (%1)</source> <translation>Файлы для импорта (%1)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="436"/> + <location filename="../ProfileInterface.cpp" line="457"/> <source>All image files (%1)</source> <translation>Все файлы изображений (%1)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="666"/> + <location filename="../ProfileInterface.cpp" line="687"/> <source>Can't import %1 because file can't be parsed properly</source> <translation>Не получилось импортировать %1, файл не может быть правильно обработан</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="746"/> + <location filename="../ProfileInterface.cpp" line="767"/> <source>Can't import %1 because file format can't be detected</source> <translation>Не получилось импортировать %1, не удалось определить формат файла</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="761"/> + <location filename="../ProfileInterface.cpp" line="783"/> <source>Failed to import the Snapmatic picture, file not begin with PGTA or end with .g5e</source> <translation>Не удалось импортировать картинку Snapmatic, название не начинается с PGTA или не заканчивается с .g5e</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="766"/> + <location filename="../ProfileInterface.cpp" line="788"/> <source>Failed to import the Snapmatic picture, the picture is already in the game</source> <translation>Не удалось импортировать картинку Snapmatic, картинка уже в игре</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="777"/> + <location filename="../ProfileInterface.cpp" line="800"/> <source>Failed to import the Snapmatic picture, can't copy the file into profile</source> <translation>Не удалось импортировать картинку Snapmatic, не получилось скопировать файл в профиль</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="814"/> + <location filename="../ProfileInterface.cpp" line="837"/> <source>Failed to import the Savegame, can't copy the file into profile</source> <translation>Не удалось импортировать сохранение, не получилось скопировать файл в профиль</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="820"/> + <location filename="../ProfileInterface.cpp" line="843"/> <source>Failed to import the Savegame, no Savegame slot is left</source> <translation>Не удалось импортировать сохранение, нет пустых ячеек под сохранения</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="907"/> - <location filename="../ProfileInterface.cpp" line="925"/> + <location filename="../ProfileInterface.cpp" line="930"/> + <location filename="../ProfileInterface.cpp" line="948"/> <source>JPG pictures and GTA Snapmatic</source> <translation>Картинки JPG и GTA Snapmatic</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="908"/> - <location filename="../ProfileInterface.cpp" line="930"/> + <location filename="../ProfileInterface.cpp" line="931"/> + <location filename="../ProfileInterface.cpp" line="953"/> <source>JPG pictures only</source> <translation>Только картинки JPG</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="909"/> - <location filename="../ProfileInterface.cpp" line="934"/> + <location filename="../ProfileInterface.cpp" line="932"/> + <location filename="../ProfileInterface.cpp" line="957"/> <source>GTA Snapmatic only</source> <translation>Только GTA Snapmatic</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="968"/> + <location filename="../ProfileInterface.cpp" line="991"/> <source>Initialising export...</source> <translation>Подготовка к экспорту...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1021"/> - <location filename="../ProfileInterface.cpp" line="1063"/> + <location filename="../ProfileInterface.cpp" line="1044"/> + <location filename="../ProfileInterface.cpp" line="1086"/> <source>No Snapmatic pictures or Savegames files are selected</source> <translation>Не выделены ни один Snapmatic или сохранение</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1029"/> - <location filename="../ProfileInterface.cpp" line="1057"/> - <location filename="../ProfileInterface.cpp" line="1063"/> + <location filename="../ProfileInterface.cpp" line="1052"/> + <location filename="../ProfileInterface.cpp" line="1080"/> + <location filename="../ProfileInterface.cpp" line="1086"/> <source>Remove selected</source> <translation>Снять выделение</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1029"/> + <location filename="../ProfileInterface.cpp" line="1052"/> <source>You really want remove the selected Snapmatic picutres and Savegame files?</source> <translation>Точно ли хочешь удалить выбранные картинки Snapmatic и файлы сохранений?</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1057"/> + <location filename="../ProfileInterface.cpp" line="1080"/> <source>Failed at remove the complete selected Snapmatic pictures and/or Savegame files</source> <translation>Не удалось удалить полностью выбранные картинки Snapmatic и/или файлы сохранений</translation> </message> @@ -1267,20 +1277,20 @@ Press 1 for Default View</source> <translation type="obsolete">Не получилось имортировать копию сохранения, потому что не осталось свободных под них слотов</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="884"/> - <location filename="../ProfileInterface.cpp" line="922"/> - <location filename="../ProfileInterface.cpp" line="1001"/> - <location filename="../ProfileInterface.cpp" line="1021"/> + <location filename="../ProfileInterface.cpp" line="907"/> + <location filename="../ProfileInterface.cpp" line="945"/> + <location filename="../ProfileInterface.cpp" line="1024"/> + <location filename="../ProfileInterface.cpp" line="1044"/> <source>Export selected</source> <translation>Экспортировать выделенное</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="922"/> + <location filename="../ProfileInterface.cpp" line="945"/> <source>%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:</source> <translation>%1Эскпортировать картинки Snapmatic%2<br><br>Картинки JPG можно открыть любым просмотрщиком<br>Картинки формата GTA Snapmatic можно снова импортировать в игру<br><br>Экспортировать как:</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="967"/> + <location filename="../ProfileInterface.cpp" line="990"/> <source>Export selected...</source> <translation>Экпортировать выделенное...</translation> </message> @@ -1289,7 +1299,7 @@ Press 1 for Default View</source> <translation type="vanished">Подготавливаю эскпорт...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1001"/> + <location filename="../ProfileInterface.cpp" line="1024"/> <source>Export failed with... %1</source> @@ -1310,7 +1320,7 @@ Press 1 for Default View</source> <translation>Все файлы профиля (*.g5e SGTA* PGTA*)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="433"/> + <location filename="../ProfileInterface.cpp" line="454"/> <location filename="../UserInterface.cpp" line="375"/> <source>GTA V Export (*.g5e)</source> <translation>GTA V Export (*.g5e)</translation> @@ -1466,32 +1476,32 @@ Press 1 for Default View</source> <translation>Не удалось удалить сохранение %1</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1205"/> + <location filename="../ProfileInterface.cpp" line="1228"/> <source>&View</source> <translation>&Просмотр</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1207"/> + <location filename="../ProfileInterface.cpp" line="1230"/> <source>&Remove</source> <translation>&Удалить</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1209"/> + <location filename="../ProfileInterface.cpp" line="1232"/> <source>&Select</source> <translation>&Выбрать</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1210"/> + <location filename="../ProfileInterface.cpp" line="1233"/> <source>&Deselect</source> <translation>Сн&ять выбор</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1213"/> + <location filename="../ProfileInterface.cpp" line="1236"/> <source>Select &All</source> <translation>В&ыбрать все</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1217"/> + <location filename="../ProfileInterface.cpp" line="1240"/> <source>&Deselect All</source> <translation>Снять выбо&р со всех</translation> </message> @@ -1501,7 +1511,7 @@ Press 1 for Default View</source> <translation>Копировать сохранение</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1206"/> + <location filename="../ProfileInterface.cpp" line="1229"/> <source>&Export</source> <translation>&Экспортировать</translation> </message> @@ -1716,7 +1726,7 @@ Press 1 for Default View</source> <context> <name>SnapmaticPicture</name> <message> - <location filename="../SnapmaticPicture.cpp" line="417"/> + <location filename="../SnapmaticPicture.cpp" line="440"/> <source>PHOTO - %1</source> <translation>ФОТО - %1</translation> </message> @@ -1776,17 +1786,17 @@ Press 1 for Default View</source> <translation>Не удалось удалить %1 из колелкции картинок Snapmatic </translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1155"/> + <location filename="../ProfileInterface.cpp" line="1178"/> <source>Edi&t</source> <translation>&Правка</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1158"/> + <location filename="../ProfileInterface.cpp" line="1181"/> <source>Show &In-game</source> <translation>Показывать в &игре</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1162"/> + <location filename="../ProfileInterface.cpp" line="1185"/> <source>Hide &In-game</source> <translation>Ск&рыть в игре</translation> </message> @@ -1795,7 +1805,7 @@ Press 1 for Default View</source> <translation type="vanished">&Изменить свойства...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1168"/> + <location filename="../ProfileInterface.cpp" line="1191"/> <source>&Export</source> <translation>&Экспорт</translation> </message> @@ -1808,32 +1818,32 @@ Press 1 for Default View</source> <translation type="vanished">Экс&портировать как GTA Snapmatic...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1171"/> + <location filename="../ProfileInterface.cpp" line="1194"/> <source>&View</source> <translation>По&казать</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1174"/> + <location filename="../ProfileInterface.cpp" line="1197"/> <source>&Remove</source> <translation>У&далить</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1176"/> + <location filename="../ProfileInterface.cpp" line="1199"/> <source>&Select</source> <translation>&Выделить</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1177"/> + <location filename="../ProfileInterface.cpp" line="1200"/> <source>&Deselect</source> <translation>Сн&ять выделение</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1180"/> + <location filename="../ProfileInterface.cpp" line="1203"/> <source>Select &All</source> <translation>В&ыбрать все</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1184"/> + <location filename="../ProfileInterface.cpp" line="1207"/> <source>&Deselect All</source> <translation>Снять выбо&р со всех</translation> </message>