diff --git a/JsonEditorDialog.cpp b/JsonEditorDialog.cpp index ed89dd3..ecfbfae 100644 --- a/JsonEditorDialog.cpp +++ b/JsonEditorDialog.cpp @@ -183,6 +183,7 @@ bool JsonEditorDialog::saveJsonContent() return false; } jsonCode = newCode; + smpic->updateStrings(); smpic->emitUpdate(); return true; } diff --git a/ProfileInterface.cpp b/ProfileInterface.cpp index 737c475..1401f3d 100644 --- a/ProfileInterface.cpp +++ b/ProfileInterface.cpp @@ -480,7 +480,7 @@ fileDialogPreOpen: //Work? fileDialog.setOption(QFileDialog::DontUseNativeDialog, dontUseNativeDialog); fileDialog.setWindowFlags(fileDialog.windowFlags()^Qt::WindowContextHelpButtonHint); fileDialog.setWindowTitle(tr("Import...")); - fileDialog.setLabelText(QFileDialog::Accept, tr("Import")); + fileDialog.setLabelText(QFileDialog::Accept, tr("Import...")); // Getting readable Image formats QString imageFormatsStr = " "; @@ -524,7 +524,7 @@ fileDialogPreOpen: //Work? } else { - QMessageBox::warning(this, tr("Import"), tr("No valid file is selected")); + QMessageBox::warning(this, tr("Import..."), tr("No valid file is selected")); goto fileDialogPreOpen; //Work? } } @@ -579,7 +579,7 @@ bool ProfileInterface::importFilesProgress(QStringList selectedFiles) if (errorStr != "") { errorStr.remove(0, 2); - QMessageBox::warning(this, tr("Import"), tr("Import failed with...\n\n%1").arg(errorStr)); + QMessageBox::warning(this, tr("Import..."), tr("Import failed with...\n\n%1").arg(errorStr)); return false; } return true; @@ -601,7 +601,7 @@ bool ProfileInterface::importFile(QString selectedFile, QDateTime importDateTime } else { - if (notMultiple) QMessageBox::warning(this, tr("Import"), tr("Failed to read Snapmatic picture")); + if (notMultiple) QMessageBox::warning(this, tr("Import..."), tr("Failed to read Snapmatic picture")); delete picture; return false; } @@ -617,7 +617,7 @@ bool ProfileInterface::importFile(QString selectedFile, QDateTime importDateTime } else { - if (notMultiple) QMessageBox::warning(this, tr("Import"), tr("Failed to read Savegame file")); + if (notMultiple) QMessageBox::warning(this, tr("Import..."), tr("Failed to read Savegame file")); delete savegame; return false; } @@ -722,7 +722,7 @@ bool ProfileInterface::importFile(QString selectedFile, QDateTime importDateTime QFile snapmaticFile(selectedFile); if (!snapmaticFile.open(QFile::ReadOnly)) { - QMessageBox::warning(this, tr("Import"), tr("Can't import %1 because file can't be open").arg("\""+selectedFileName+"\"")); + QMessageBox::warning(this, tr("Import..."), tr("Can't import %1 because file can't be open").arg("\""+selectedFileName+"\"")); delete picture; return false; } @@ -732,7 +732,7 @@ bool ProfileInterface::importFile(QString selectedFile, QDateTime importDateTime snapmaticImageReader.setDevice(&snapmaticFile); if (!snapmaticImageReader.read(snapmaticImage)) { - QMessageBox::warning(this, tr("Import"), tr("Can't import %1 because file can't be parsed properly").arg("\""+selectedFileName+"\"")); + QMessageBox::warning(this, tr("Import..."), tr("Can't import %1 because file can't be parsed properly").arg("\""+selectedFileName+"\"")); delete snapmaticImage; delete picture; return false; @@ -811,12 +811,12 @@ bool ProfileInterface::importFile(QString selectedFile, QDateTime importDateTime #endif delete picture; delete savegame; - if (notMultiple) QMessageBox::warning(this, tr("Import"), tr("Can't import %1 because file format can't be detected").arg("\""+selectedFileName+"\"")); + if (notMultiple) QMessageBox::warning(this, tr("Import..."), tr("Can't import %1 because file format can't be detected").arg("\""+selectedFileName+"\"")); return false; } } } - if (notMultiple) QMessageBox::warning(this, tr("Import"), tr("No valid file is selected")); + if (notMultiple) QMessageBox::warning(this, tr("Import..."), tr("No valid file is selected")); return false; } @@ -976,15 +976,86 @@ bool ProfileInterface::importSnapmaticPicture(SnapmaticPicture *picture, bool wa QString adjustedFileName = picture->getOriginalPictureFileName(); if (picFileName.left(4) != "PGTA") { - if (warn) QMessageBox::warning(this, tr("Import"), tr("Failed to import the Snapmatic picture, file not begin with PGTA or end with .g5e")); + if (warn) QMessageBox::warning(this, tr("Import..."), tr("Failed to import the Snapmatic picture, file not begin with PGTA or end with .g5e")); return false; } else if (QFile::exists(profileFolder % "/" % adjustedFileName) || QFile::exists(profileFolder % "/" % adjustedFileName % ".hidden")) { - if (warn) QMessageBox::warning(this, tr("Import"), tr("Failed to import the Snapmatic picture, the picture is already in the game")); - return false; + SnapmaticProperties snapmaticProperties = picture->getSnapmaticProperties(); + if (warn) + { + int uchoice = QMessageBox::question(this, tr("Import..."), tr("A Snapmatic picture already exists with the uid %1, you want assign your import a new uid and timestamp?").arg(QString::number(snapmaticProperties.uid)), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes); + if (uchoice == QMessageBox::Yes) + { + // Update Snapmatic uid + snapmaticProperties.uid = getRandomUid(); + snapmaticProperties.createdDateTime = QDateTime::currentDateTime(); + snapmaticProperties.createdTimestamp = snapmaticProperties.createdDateTime.toTime_t(); + bool fExists = QFile::exists(profileFolder % "/PGTA5" % QString::number(snapmaticProperties.uid)); + bool fExistsBackup = QFile::exists(profileFolder % "/PGTA5" % QString::number(snapmaticProperties.uid) % ".bak"); + bool fExistsHidden = QFile::exists(profileFolder % "/PGTA5" % QString::number(snapmaticProperties.uid) % ".hidden"); + int cEnough = 0; + while ((fExists || fExistsBackup || fExistsHidden) && cEnough < findRetryLimit) + { + snapmaticProperties.uid = getRandomUid(); + fExists = QFile::exists(profileFolder % "/PGTA5" % QString::number(snapmaticProperties.uid)); + fExistsBackup = QFile::exists(profileFolder % "/PGTA5" % QString::number(snapmaticProperties.uid) % ".bak"); + fExistsHidden = QFile::exists(profileFolder % "/PGTA5" % QString::number(snapmaticProperties.uid) % ".hidden"); + cEnough++; + } + if (fExists || fExistsBackup || fExistsHidden) + { + // That should never happen + return false; + } + if (!picture->setSnapmaticProperties(snapmaticProperties)) + { + // That should never happen + return false; + } + picture->updateStrings(); + picFileName = picture->getPictureFileName(); + adjustedFileName = picture->getOriginalPictureFileName(); + } + else + { + return false; + } + } + else + { + // Update Snapmatic uid + snapmaticProperties.uid = getRandomUid(); + snapmaticProperties.createdDateTime = QDateTime::currentDateTime(); + snapmaticProperties.createdTimestamp = snapmaticProperties.createdDateTime.toTime_t(); + bool fExists = QFile::exists(profileFolder % "/PGTA5" % QString::number(snapmaticProperties.uid)); + bool fExistsBackup = QFile::exists(profileFolder % "/PGTA5" % QString::number(snapmaticProperties.uid) % ".bak"); + bool fExistsHidden = QFile::exists(profileFolder % "/PGTA5" % QString::number(snapmaticProperties.uid) % ".hidden"); + int cEnough = 0; + while ((fExists || fExistsBackup || fExistsHidden) && cEnough < findRetryLimit) + { + snapmaticProperties.uid = getRandomUid(); + fExists = QFile::exists(profileFolder % "/PGTA5" % QString::number(snapmaticProperties.uid)); + fExistsBackup = QFile::exists(profileFolder % "/PGTA5" % QString::number(snapmaticProperties.uid) % ".bak"); + fExistsHidden = QFile::exists(profileFolder % "/PGTA5" % QString::number(snapmaticProperties.uid) % ".hidden"); + cEnough++; + } + if (fExists || fExistsBackup || fExistsHidden) + { + // That should never happen + return false; + } + if (!picture->setSnapmaticProperties(snapmaticProperties)) + { + // That should never happen + return false; + } + picture->updateStrings(); + picFileName = picture->getPictureFileName(); + adjustedFileName = picture->getOriginalPictureFileName(); + } } - else if (picture->exportPicture(profileFolder % "/" % adjustedFileName, SnapmaticFormat::PGTA_Format)) + if (picture->exportPicture(profileFolder % "/" % adjustedFileName, SnapmaticFormat::PGTA_Format)) { picture->setSnapmaticFormat(SnapmaticFormat::PGTA_Format); picture->setPicFilePath(profileFolder % "/" % adjustedFileName); @@ -993,7 +1064,7 @@ bool ProfileInterface::importSnapmaticPicture(SnapmaticPicture *picture, bool wa } else { - if (warn) QMessageBox::warning(this, tr("Import"), tr("Failed to import the Snapmatic picture, can't copy the file into profile")); + if (warn) QMessageBox::warning(this, tr("Import..."), tr("Failed to import the Snapmatic picture, can't copy the file into profile")); return false; } } @@ -1030,13 +1101,13 @@ bool ProfileInterface::importSavegameData(SavegameData *savegame, QString sgdPat } else { - if (warn) QMessageBox::warning(this, tr("Import"), tr("Failed to import the Savegame, can't copy the file into profile")); + if (warn) QMessageBox::warning(this, tr("Import..."), tr("Failed to import the Savegame, can't copy the file into profile")); return false; } } else { - if (warn) QMessageBox::warning(this, tr("Import"), tr("Failed to import the Savegame, no Savegame slot is left")); + if (warn) QMessageBox::warning(this, tr("Import..."), tr("Failed to import the Savegame, no Savegame slot is left")); return false; } } diff --git a/SnapmaticEditor.cpp b/SnapmaticEditor.cpp index adef8e7..45f229a 100644 --- a/SnapmaticEditor.cpp +++ b/SnapmaticEditor.cpp @@ -330,6 +330,7 @@ void SnapmaticEditor::on_cmdApply_clicked() } else { + smpic->updateStrings(); smpic->emitUpdate(); } } diff --git a/gta5view.pro b/gta5view.pro index d6a9cad..631abfb 100644 --- a/gta5view.pro +++ b/gta5view.pro @@ -167,9 +167,10 @@ DEFINES += GTA5SYNC_NOASSIST # Not assisting at proper usage of SnapmaticPicture win32: DEFINES += GTA5SYNC_WIN win32: RC_FILE += res/app.rc -win32: LIBS += -luser32 -ld3d9 +win32: LIBS += -luser32 win32: CONFIG -= embed_manifest_exe contains(DEFINES, GTA5SYNC_APV): greaterThan(QT_MAJOR_VERSION, 4): greaterThan(QT_MINOR_VERSION, 1): win32: LIBS += -ldwmapi +contains(DEFINES, GTA5SYNC_TELEMETRY): win32: LIBS += -ld3d9 # Required for getting information about GPU # MAC OS X ONLY macx: ICON = res/5sync.icns diff --git a/res/gta5sync.ts b/res/gta5sync.ts index 40d457f..a22bb0f 100644 --- a/res/gta5sync.ts +++ b/res/gta5sync.ts @@ -935,37 +935,37 @@ Y: %2 - + Export as &Picture... - + Export as &Snapmatic... - + &Edit Properties... - + &Overwrite Image... - + Open &Map Viewer... - + Open &JSON Editor... @@ -1219,8 +1219,22 @@ Press 1 for Default View + + + + + + + + + + + + + + Import... @@ -1234,20 +1248,6 @@ Press 1 for Default View - - - - - - - - - - - - - - Import @@ -1375,109 +1375,109 @@ Press 1 for Default View - - Failed to import the Snapmatic picture, the picture is already in the game + + A Snapmatic picture already exists with the uid %1, you want assign your import a new uid and timestamp? - + Failed to import the Snapmatic picture, can't copy the file into profile - + Failed to import the Savegame, can't copy the file into profile - + Failed to import the Savegame, no Savegame slot is left - - - - - + + + + + Export selected... - - + + JPG pictures and GTA Snapmatic - - + + JPG pictures only - - + + GTA Snapmatic only - + %1Export Snapmatic pictures%2<br><br>JPG pictures make it possible to open the picture with a Image Viewer<br>GTA Snapmatic make it possible to import the picture into the game<br><br>Export as: - + Initialising export... - + Export failed with... %1 - - + + No Snapmatic pictures or Savegames files are selected - - - + + + Remove selected - + You really want remove the selected Snapmatic picutres and Savegame files? - + Failed to remove all selected Snapmatic pictures and/or Savegame files - - - - - - + + + + + + No Snapmatic pictures are selected - - - - - - + + + + + + %1 failed with... %2 @@ -1485,81 +1485,81 @@ Press 1 for Default View - - + + Qualify as Avatar - - - - + + + + Patch selected... - - - - - - - - + + + + + + + + Patch file %1 of %2 files - + Qualify %1 failed with... - - + + Change Players... - + Change Players %1 failed with... - - - + + + Change Crew... - + Failed to enter a valid Snapmatic Crew ID - + Change Crew %1 failed with... - - - + + + Change Title... - + Failed to enter a valid Snapmatic title - + Change Title %1 failed with... @@ -1661,37 +1661,37 @@ Press 1 for Default View - + &View - + &Export - + &Remove - + &Select - + &Deselect - + Select &All - + &Deselect All @@ -1788,7 +1788,7 @@ Press 1 for Default View - + @@ -1889,31 +1889,31 @@ Press 1 for Default View - + Patching of Snapmatic Properties failed because of JSON Error - - + + Snapmatic Crew - - + + New Snapmatic crew: - - + + Snapmatic Title - - + + New Snapmatic title: @@ -2087,52 +2087,52 @@ Press 1 for Default View - + Edi&t - + Show &In-game - + Hide &In-game - + &Export - + &View - + &Remove - + &Select - + &Deselect - + Select &All - + &Deselect All @@ -2351,15 +2351,15 @@ Press 1 for Default View - - + + Show In-game - - + + Hide In-game diff --git a/res/gta5sync_de.qm b/res/gta5sync_de.qm index 4a7499a..288b665 100644 Binary files a/res/gta5sync_de.qm and b/res/gta5sync_de.qm differ diff --git a/res/gta5sync_de.ts b/res/gta5sync_de.ts index e988307..1a79586 100644 --- a/res/gta5sync_de.ts +++ b/res/gta5sync_de.ts @@ -956,31 +956,31 @@ Y: %2 - + Export as &Picture... Als &Bild exportieren... - + Export as &Snapmatic... Als &Snapmatic exportieren... - + &Edit Properties... Eigenschaften bearb&eiten... - + &Overwrite Image... Bild &überschreiben... - + Open &Map Viewer... &Kartenansicht öffnen... @@ -1129,7 +1129,7 @@ Drücke 1 für Standardmodus - + Open &JSON Editor... &JSON Editor öffnen... @@ -1246,8 +1246,22 @@ Drücke 1 für Standardmodus + + + + + + + + + + + + + + Import... Importieren... @@ -1261,20 +1275,6 @@ Drücke 1 für Standardmodus - - - - - - - - - - - - - - Import Importieren @@ -1361,7 +1361,7 @@ Drücke 1 für Standardmodus Kann %1 nicht importieren weil das Dateiformat nicht erkannt werden kann - + Initialising export... Initialisiere Export... @@ -1371,12 +1371,7 @@ Drücke 1 für Standardmodus Fehlgeschlagen beim Importieren vom Snapmatic Bild, Datei beginnt nicht mit PGTA oder endet mit .g5e - - Failed to import the Snapmatic picture, the picture is already in the game - Fehlgeschlagen beim Importieren vom Snapmatic Bild, dieses Bild ist bereits im Spiel - - - + %1Export Snapmatic pictures%2<br><br>JPG pictures make it possible to open the picture with a Image Viewer<br>GTA Snapmatic make it possible to import the picture into the game<br><br>Export as: %1Exportiere Snapmatic Bilder%2<br><br>JPG Bilder machen es möglich sie mit ein Bildansicht Programm zu öffnen<br>Das GTA Snapmatic Format macht es möglich sie wieder ins Game zu importieren<br><br>Exportieren als: @@ -1393,86 +1388,91 @@ Drücke 1 für Standardmodus Aktivierte Bilder: %1 von %2 - + + A Snapmatic picture already exists with the uid %1, you want assign your import a new uid and timestamp? + Ein Snapmatic Bild mit der Uid %1 existiert bereits, möchtest du dein Import eine neue Uid und Zeitstempel zuweisen? + + + Failed to import the Snapmatic picture, can't copy the file into profile Fehlgeschlagen beim Importieren vom Snapmatic Bild, kann Snapmatic Bild nicht ins Profil kopieren - + Failed to import the Savegame, can't copy the file into profile Fehlgeschlagen beim Importieren vom Spielstand, kann Spielstanddatei nicht ins Profil kopieren - + Failed to import the Savegame, no Savegame slot is left Fehlgeschlagen beim Importieren vom Spielstand, kein Spielstandslot mehr frei - - + + JPG pictures and GTA Snapmatic JPG Bilder und GTA Snapmatic - - + + JPG pictures only Nur JPG Bilder - - + + GTA Snapmatic only Nur GTA Snapmatic - - - - + + + + Patch selected... Auswahl patchen... - - - - - - - - + + + + + + + + Patch file %1 of %2 files Patche Datei %1 von %2 Dateien - - + + Qualify as Avatar Als Avatar qualifizieren - - - - - - + + + + + + No Snapmatic pictures are selected Keine Snapmatic Bilder sind ausgewählt - + Failed to remove all selected Snapmatic pictures and/or Savegame files Fehlgeschlagen beim Entfernen von allen augewählten Snapmatic Bildern und/oder Spielstanddateien - - - - - - + + + + + + %1 failed with... %2 @@ -1487,88 +1487,88 @@ Drücke 1 für Standardmodus Bereite Inhalt für Import vor... - + Qualify %1 failed with... Qualifizieren - - + + Change Players... Spieler ändern... - + Change Players %1 failed with... Spieler ändern - - - + + + Change Crew... Crew ändern... - + Failed to enter a valid Snapmatic Crew ID Fehlgeschlagen beim Eingeben von einer gültigen Crew ID - + Change Crew %1 failed with... Crew ändern - - - + + + Change Title... Titel ändern... - + Failed to enter a valid Snapmatic title Fehlgeschlagen beim Eingeben eines gültigen Snapmatic Titel - + Change Title %1 failed with... Titel ändern - - + + No Snapmatic pictures or Savegames files are selected Keine Snapmatic Bilder oder Spielstände sind ausgewählt - - - + + + Remove selected Auswahl löschen - + You really want remove the selected Snapmatic picutres and Savegame files? Möchtest du wirklich die ausgewählten Snapmatic Bilder und Spielstanddateien löschen? - - - - - + + + + + Export selected... Auswahl exportieren... - + Export failed with... %1 @@ -1722,32 +1722,32 @@ Drücke 1 für Standardmodus Fehlgeschlagen beim Löschen %1 von deinen Spielständen - + &View A&nsehen - + &Remove Entfe&rnen - + &Select Au&swählen - + &Deselect A&bwählen - + Select &All &Alles auswählen - + &Deselect All Alles a&bwählen @@ -1762,7 +1762,7 @@ Drücke 1 für Standardmodus Spielstand kopieren - + &Export &Exportieren @@ -1813,7 +1813,7 @@ Drücke 1 für Standardmodus - + @@ -1856,8 +1856,8 @@ Drücke 1 für Standardmodus Meme - - + + Snapmatic Title Snapmatic Titel @@ -1959,7 +1959,7 @@ Drücke 1 für Standardmodus Patchen von Snapmatic Eigenschaften fehlgeschlagen wegen %1 - + Patching of Snapmatic Properties failed because of JSON Error Patchen von Snapmatic Eigenschaften fehlgeschlagen wegen JSON Fehler @@ -1972,20 +1972,20 @@ Drücke 1 für Standardmodus Patchen von Snapmatic Eigenschaften fehlgeschlagen wegen I/O Fehler - - + + New Snapmatic title: Neuer Snapmatic Titel: - - + + Snapmatic Crew Snapmatic Crew - - + + New Snapmatic crew: Neue Snapmatic Crew: @@ -2112,52 +2112,52 @@ Drücke 1 für Standardmodus Fehlgeschlagen beim Anzeigen von %1 im Spiel von deinen Snapmatic Bildern - + Edi&t Bearbei&ten - + &Export &Exportieren - + Show &In-game &Im Spiel anzeigen - + Hide &In-game &Im Spiel ausblenden - + &View A&nsehen - + &Remove Entfe&rnen - + &Select Au&swählen - + &Deselect A&bwählen - + Select &All Alles &auswählen - + &Deselect All Alles a&bwählen @@ -2401,15 +2401,15 @@ Drücke 1 für Standardmodus &Neuladen - - + + Show In-game Im Spiel anzeigen - - + + Hide In-game Im Spiel ausblenden diff --git a/res/gta5sync_en_US.qm b/res/gta5sync_en_US.qm index 1db696b..5bcd6f9 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 a6e3121..5883145 100644 --- a/res/gta5sync_en_US.ts +++ b/res/gta5sync_en_US.ts @@ -935,31 +935,31 @@ Y: %2 - + Export as &Picture... - + Export as &Snapmatic... - + &Overwrite Image... - + &Edit Properties... - + Open &Map Viewer... @@ -1111,7 +1111,7 @@ Press 1 for Default View - + Open &JSON Editor... @@ -1239,8 +1239,22 @@ Press 1 for Default View + + + + + + + + + + + + + + Import... @@ -1254,20 +1268,6 @@ Press 1 for Default View - - - - - - - - - - - - - - Import @@ -1370,130 +1370,125 @@ Press 1 for Default View - - Failed to import the Snapmatic picture, the picture is already in the game - - - - + Failed to import the Snapmatic picture, can't copy the file into profile - + Failed to import the Savegame, can't copy the file into profile - + Failed to import the Savegame, no Savegame slot is left - - + + JPG pictures and GTA Snapmatic - - + + JPG pictures only - - + + GTA Snapmatic only - + %1Export Snapmatic pictures%2<br><br>JPG pictures make it possible to open the picture with a Image Viewer<br>GTA Snapmatic make it possible to import the picture into the game<br><br>Export as: - - - - - + + + + + Export selected... - + Initialising export... Initializing export... - + Export failed with... %1 - - + + No Snapmatic pictures or Savegames files are selected - - - + + + Remove selected - + You really want remove the selected Snapmatic picutres and Savegame files? - - + + Qualify as Avatar - - - - - - + + + + + + No Snapmatic pictures are selected - - - - + + + + Patch selected... - - - - - - - - + + + + + + + + Patch file %1 of %2 files - - - - - - + + + + + + %1 failed with... %2 @@ -1501,7 +1496,7 @@ Press 1 for Default View - + Failed to remove all selected Snapmatic pictures and/or Savegame files @@ -1511,55 +1506,60 @@ Press 1 for Default View - + + A Snapmatic picture already exists with the uid %1, you want assign your import a new uid and timestamp? + + + + Qualify %1 failed with... - - + + Change Players... - + Change Players %1 failed with... - - - + + + Change Crew... - + Failed to enter a valid Snapmatic Crew ID - + Change Crew %1 failed with... - - - + + + Change Title... - + Failed to enter a valid Snapmatic title - + Change Title %1 failed with... @@ -1661,37 +1661,37 @@ Press 1 for Default View - + &View - + &Export - + &Remove - + &Select - + &Deselect - + Select &All - + &Deselect All @@ -1788,7 +1788,7 @@ Press 1 for Default View - + @@ -1928,7 +1928,7 @@ Press 1 for Default View - + Patching of Snapmatic Properties failed because of JSON Error @@ -1941,26 +1941,26 @@ Press 1 for Default View - - + + Snapmatic Title - - + + New Snapmatic title: - - + + Snapmatic Crew - - + + New Snapmatic crew: @@ -2087,52 +2087,52 @@ Press 1 for Default View - + Edi&t - + Show &In-game - + Hide &In-game - + &Export - + &View - + &Remove - + &Select - + &Deselect - + Select &All - + &Deselect All @@ -2376,15 +2376,15 @@ Press 1 for Default View - - + + Show In-game - - + + Hide In-game diff --git a/res/gta5sync_fr.qm b/res/gta5sync_fr.qm index b15e8f1..5dce8f4 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 0058fb3..97bb5f3 100644 --- a/res/gta5sync_fr.ts +++ b/res/gta5sync_fr.ts @@ -1036,31 +1036,31 @@ Y : %2 - + Export as &Picture... Exporter comme &image... - + Export as &Snapmatic... Exporter comme &Snapmatic... - + &Overwrite Image... &Remplacer l'image... - + &Edit Properties... Modifier les &propriétés... - + Open &Map Viewer... Ouvrir la &Visionneuse de Carte... @@ -1129,7 +1129,7 @@ Appuyer sur 1 pour le mode par défaut - + Open &JSON Editor... Ouvrir l'éditeur &JSON... @@ -1257,8 +1257,22 @@ Appuyer sur 1 pour le mode par défaut + + + + + + + + + + + + + + Import... Importer... @@ -1272,20 +1286,6 @@ Appuyer sur 1 pour le mode par défaut - - - - - - - - - - - - - - Import Importer @@ -1384,105 +1384,100 @@ Appuyer sur 1 pour le mode par défaut Impossible d'importer la photo Snapmatic,nom de fichier incorrect (PGTA*, *.g5e) - - Failed to import the Snapmatic picture, the picture is already in the game - Impossible d'importer la photo Snapmatic, un fichier du même nom existe déjà - - - + Failed to import the Snapmatic picture, can't copy the file into profile Impossible d'importer la photo Snapmatic, impossible de copier le fichier dans le profil - + Failed to import the Savegame, can't copy the file into profile Impossible d'importer la sauvegarde, impossible de copier le fichier dans le profil - + Failed to import the Savegame, no Savegame slot is left Impossible d'importer la sauvegarde, aucun emplacement libre - - + + JPG pictures and GTA Snapmatic Images JPG et GTA Snapmatic - - + + JPG pictures only Images JPG seulement - - + + GTA Snapmatic only GTA Snapmatic seulement - + %1Export Snapmatic pictures%2<br><br>JPG pictures make it possible to open the picture with a Image Viewer<br>GTA Snapmatic make it possible to import the picture into the game<br><br>Export as: %1Exporter les photos Snapmatic%2<br><br>Les fichiers JPG permettent d'ouvrir les photos avec une visionneuse d'images<br>Les GTA Snapmatic permettent d'importer les photos dans le jeu<br><br>Exporter comme : - - - - - + + + + + Export selected... Exporter la sélection... - + Initialising export... Initialisation de l'export... - - + + Qualify as Avatar Qualifier comme Avatar - - - - - - + + + + + + No Snapmatic pictures are selected Aucun Snapmatic sélectionné - - - - + + + + Patch selected... Patcher la sélection... - - - - - - - - + + + + + + + + Patch file %1 of %2 files Patch du fichier %1 sur %2 - - - - - - + + + + + + %1 failed with... %2 @@ -1492,7 +1487,7 @@ Appuyer sur 1 pour le mode par défaut %2 - + Failed to remove all selected Snapmatic pictures and/or Savegame files Échec de la supression des Snapmatic et/ou des fichiers de sauvegarde sélectionnés @@ -1502,61 +1497,66 @@ Appuyer sur 1 pour le mode par défaut - + + A Snapmatic picture already exists with the uid %1, you want assign your import a new uid and timestamp? + + + + Qualify %1 failed with... Qualifier - - + + Change Players... Modifier les joueurs... - + Change Players %1 failed with... Modifier les joueurs - - - + + + Change Crew... Modifier le Crew... - + Failed to enter a valid Snapmatic Crew ID Snapmatic Crew ID invalide - + Change Crew %1 failed with... Changer le Crew - - - + + + Change Title... Changer le titre... - + Failed to enter a valid Snapmatic title Titre Snapmatic invalide - + Change Title %1 failed with... Changer le titre - + Export failed with... %1 @@ -1565,20 +1565,20 @@ Appuyer sur 1 pour le mode par défaut %1 - - + + No Snapmatic pictures or Savegames files are selected Aucun fichier de sauvegarde ou photo Snapmatic sélectionné - - - + + + Remove selected Supprimer la sélection - + You really want remove the selected Snapmatic picutres and Savegame files? Supprimer la sélection ? @@ -1685,7 +1685,7 @@ Appuyer sur 1 pour le mode par défaut Supprimer - + &Export &Exporter @@ -1776,32 +1776,32 @@ Appuyer sur 1 pour le mode par défaut Impossible de supprimer %1 - + &View &Voir - + &Remove &Supprimer - + &Select &Sélectionner - + &Deselect &Déselectionner - + Select &All Sélectionner to&ut - + &Deselect All &Déselectionner tout @@ -1814,7 +1814,7 @@ Appuyer sur 1 pour le mode par défaut - + @@ -1857,8 +1857,8 @@ Appuyer sur 1 pour le mode par défaut Meme - - + + Snapmatic Title Titre Snapmatic @@ -1962,7 +1962,7 @@ Appuyer sur 1 pour le mode par défaut Patch des propriétés Snapmatic échoué : %1 - + Patching of Snapmatic Properties failed because of JSON Error Patch des propriétés Snapmatic échoué : erreur JSON @@ -1975,20 +1975,20 @@ Appuyer sur 1 pour le mode par défaut La modification des propriétés Snapmatic a échoué : erreur d'entrée/sortie - - + + New Snapmatic title: Nouveau titre Snapmatic : - - + + Snapmatic Crew Crew Snapmatic - - + + New Snapmatic crew: Nouveau crew Snapmatic : @@ -2135,52 +2135,52 @@ Appuyer sur 1 pour le mode par défaut %1 n'a pas pu être rendu visible en jeu - + Edi&t Édi&ter - + Show &In-game &Visible en jeu - + Hide &In-game &Invisible en jeu - + &Export &Exporter - + &View &Voir - + &Remove S&upprimer - + &Select &Sélectionner - + &Deselect &Déselectionner - + Select &All Sélectionner &tout - + &Deselect All &Déselectionner tout @@ -2404,15 +2404,15 @@ Appuyer sur 1 pour le mode par défaut Impossible d'ouvrir %1, format invalide - - + + Show In-game Visible en jeu - - + + Hide In-game Invisible en jeu diff --git a/res/gta5sync_ru.qm b/res/gta5sync_ru.qm index e5de3ec..f86fe31 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 cc6c41a..1ba4985 100644 --- a/res/gta5sync_ru.ts +++ b/res/gta5sync_ru.ts @@ -967,31 +967,31 @@ Y: %2 - + Export as &Picture... Экспортировать как &картинку... - + Export as &Snapmatic... Экспортировать как &Snapmatic... - + &Overwrite Image... &Перезаписать картинку... - + &Edit Properties... &Изменить свойства... - + Open &Map Viewer... Открыть &карту... @@ -1140,7 +1140,7 @@ Press 1 for Default View - + Open &JSON Editor... Открыть &редактор JSON... @@ -1258,8 +1258,22 @@ Press 1 for Default View + + + + + + + + + + + + + + Import... Импортировать... @@ -1273,20 +1287,6 @@ Press 1 for Default View - - - - - - - - - - - - - - Import Импортировать @@ -1390,63 +1390,58 @@ Press 1 for Default View Не удалось импортировать картинку Snapmatic, название не начинается с PGTA или не заканчивается с .g5e - - Failed to import the Snapmatic picture, the picture is already in the game - Не удалось импортировать картинку Snapmatic, картинка уже в игре - - - + Failed to import the Snapmatic picture, can't copy the file into profile Не удалось импортировать картинку Snapmatic, не получилось скопировать файл в профиль - + Failed to import the Savegame, can't copy the file into profile Не удалось импортировать сохранение, не получилось скопировать файл в профиль - + Failed to import the Savegame, no Savegame slot is left Не удалось импортировать сохранение, нет пустых ячеек под сохранения - - + + JPG pictures and GTA Snapmatic Картинки JPG и GTA Snapmatic - - + + JPG pictures only Только картинки JPG - - + + GTA Snapmatic only Только GTA Snapmatic - + Initialising export... Подготовка к экспорту... - - + + No Snapmatic pictures or Savegames files are selected Не выделены ни один Snapmatic или сохранение - - - + + + Remove selected Снять выделение - + You really want remove the selected Snapmatic picutres and Savegame files? Точно ли хочешь удалить выбранные картинки Snapmatic и файлы сохранений? @@ -1456,48 +1451,48 @@ Press 1 for Default View - - + + Qualify as Avatar Пометить как Аватар - - - - - - + + + + + + No Snapmatic pictures are selected Не выделена ни одна картинка Snapmatic - - - - + + + + Patch selected... Пропатчить выделенные... - - - - - - - - + + + + + + + + Patch file %1 of %2 files Изменяется файл %1 из %2 - - - - - - + + + + + + %1 failed with... %2 @@ -1507,80 +1502,85 @@ Press 1 for Default View %2 - + + A Snapmatic picture already exists with the uid %1, you want assign your import a new uid and timestamp? + + + + Failed to remove all selected Snapmatic pictures and/or Savegame files Не удалось удалить все выделенные картинки Snapmatic и/или сохранения - + Qualify %1 failed with... Помечание - - + + Change Players... Изменить игроков... - + Change Players %1 failed with... Измение игроков - - - + + + Change Crew... Изменить банду... - + Failed to enter a valid Snapmatic Crew ID Введённый идентификатор банды не верен - + Change Crew %1 failed with... Изменение банды - - - + + + Change Title... Изменить заголовок... - + Failed to enter a valid Snapmatic title Введённый заголовок не верен - + Change Title %1 failed with... Изменение заголовка - + %1Export Snapmatic pictures%2<br><br>JPG pictures make it possible to open the picture with a Image Viewer<br>GTA Snapmatic make it possible to import the picture into the game<br><br>Export as: %1Эскпортировать картинки Snapmatic%2<br><br>Картинки JPG можно открыть любым просмотрщиком<br>Картинки формата GTA Snapmatic можно снова импортировать в игру<br><br>Экспортировать как: - - - - - + + + + + Export selected... Экпортировать выделенное... - + Export failed with... %1 @@ -1741,32 +1741,32 @@ Press 1 for Default View Не удалось удалить сохранение %1 - + &View &Просмотр - + &Remove &Удалить - + &Select &Выбрать - + &Deselect Сн&ять выбор - + Select &All В&ыбрать все - + &Deselect All Снять выбо&р со всех @@ -1776,7 +1776,7 @@ Press 1 for Default View Копировать сохранение - + &Export &Экспортировать @@ -1827,7 +1827,7 @@ Press 1 for Default View - + @@ -1880,8 +1880,8 @@ Press 1 for Default View Meme - - + + Snapmatic Title Заголовок Snapmatic @@ -1973,7 +1973,7 @@ Press 1 for Default View Не удалось изменить свойства Snapmatic из-за %1 - + Patching of Snapmatic Properties failed because of JSON Error Не удалось измененить свойства Snapmatic из-за ошибки JSON @@ -1986,20 +1986,20 @@ Press 1 for Default View Не удалось измененить свойства Snapmatic из-за проблемы ввода/вывода - - + + New Snapmatic title: Новый заголовок Snapmatic: - - + + Snapmatic Crew Банда на Snapmatic - - + + New Snapmatic crew: Новая банда на Snapmatic: @@ -2136,52 +2136,52 @@ Press 1 for Default View Не удалось показать %1 в списке картинок Snapmatic в игре - + Edi&t &Правка - + Show &In-game Показывать в &игре - + Hide &In-game Ск&рыть в игре - + &Export &Экспорт - + &View По&казать - + &Remove У&далить - + &Select &Выделить - + &Deselect Сн&ять выделение - + Select &All В&ыбрать все - + &Deselect All Снять выбо&р со всех @@ -2415,15 +2415,15 @@ Press 1 for Default View Пере&загрузить - - + + Show In-game Показывать в игре - - + + Hide In-game Скрыть в игре diff --git a/res/gta5sync_uk.qm b/res/gta5sync_uk.qm index 7d21baa..2025fcc 100644 Binary files a/res/gta5sync_uk.qm and b/res/gta5sync_uk.qm differ diff --git a/res/gta5sync_uk.ts b/res/gta5sync_uk.ts index b1c29f6..60e2b90 100644 --- a/res/gta5sync_uk.ts +++ b/res/gta5sync_uk.ts @@ -950,37 +950,37 @@ Y: %2 - + Export as &Picture... Експортувати як &зображення... - + Export as &Snapmatic... Експортувати як &Snapmatic... - + &Edit Properties... &Змінити властивості... - + &Overwrite Image... &Перезаписати зображення... - + Open &Map Viewer... Відкрити &карту... - + Open &JSON Editor... Відкрити редактор &JSON... @@ -1237,8 +1237,22 @@ Press 1 for Default View + + + + + + + + + + + + + + Import... Імпортування... @@ -1252,20 +1266,6 @@ Press 1 for Default View - - - - - - - - - - - - - - Import Імпорт @@ -1390,64 +1390,59 @@ Press 1 for Default View Не вдалося імпортувати зображення Snapmatic, файл не починається з PGTA або закінчується .g5e - - Failed to import the Snapmatic picture, the picture is already in the game - Не вдалося імпортувати знімок Snapmatic, картинка вже в грі - - - + Failed to import the Snapmatic picture, can't copy the file into profile Не вдалося імпортувати зображення Snapmatic, не можна скопіювати файл у профіль - + Failed to import the Savegame, can't copy the file into profile Не вдалося імпортувати Сейв, не можна скопіювати файл у профіль - + Failed to import the Savegame, no Savegame slot is left Не вдалося імпортувати Сейв, немає вільного слота - - - - - + + + + + Export selected... Експорт обраних... - - + + JPG pictures and GTA Snapmatic JPG картинки і GTA Snapmatic - - + + JPG pictures only Тільки JPG картинки - - + + GTA Snapmatic only Тільки GTA Snapmatic - + %1Export Snapmatic pictures%2<br><br>JPG pictures make it possible to open the picture with a Image Viewer<br>GTA Snapmatic make it possible to import the picture into the game<br><br>Export as: %1 Експортувати Snapmatic фотографії %2 <br><br> Фотографії JPG дозволяють відкривати зображення за допомогою засобу перегляду зображень<br>GTA Snapmatic дає змогу імпортувати зображення в гру<br><br>Експортувати як: - + Initialising export... Ініціалізація експорту... - + Export failed with... %1 @@ -1456,45 +1451,45 @@ Press 1 for Default View %1 - - + + No Snapmatic pictures or Savegames files are selected Не вибрано жодного Snapmatic зображення або файлу збереження - - - + + + Remove selected Видалити вибрані - + You really want remove the selected Snapmatic picutres and Savegame files? Ви дійсно хочете видалити вибрані Snapmatic фотографії та файли збереження гри? - + Failed to remove all selected Snapmatic pictures and/or Savegame files Не вдалося видалити всі обрані Snapmatic фотографії та/або Сейви - - - - - - + + + + + + No Snapmatic pictures are selected Не вибрано жодного Snapmatic зображення - - - - - - + + + + + + %1 failed with... %2 @@ -1509,81 +1504,86 @@ Press 1 for Default View - - + + A Snapmatic picture already exists with the uid %1, you want assign your import a new uid and timestamp? + + + + + Qualify as Avatar Позначити як Аватар - - - - + + + + Patch selected... Вибір патчу... - - - - - - - - + + + + + + + + Patch file %1 of %2 files Патч файлу %1 з %2 файлів - + Qualify %1 failed with... Якість - - + + Change Players... Зміна гравців... - + Change Players %1 failed with... Змінити гравців - - - + + + Change Crew... Зміна банди... - + Failed to enter a valid Snapmatic Crew ID Не вдалося ввести дійсний ID Банди Snapmatic - + Change Crew %1 failed with... Змінити банду - - - + + + Change Title... Зміна назви... - + Failed to enter a valid Snapmatic title Не вдалося ввести дійсний заголовок Snapmatic - + Change Title %1 failed with... Змінити назву @@ -1685,37 +1685,37 @@ Press 1 for Default View Видалити - + &View &Перегляд - + &Export &Експорт - + &Remove &Видалення - + &Select &Виділення - + &Deselect &Зняти виділення - + Select &All Вибрати &усі - + &Deselect All &Зняти виділення усіх @@ -1814,7 +1814,7 @@ Press 1 for Default View - + @@ -1915,31 +1915,31 @@ Press 1 for Default View Змінити властивості Snapmatic не вдалося через I/O Помилку - + Patching of Snapmatic Properties failed because of JSON Error Змінити властивості Snapmatic не вдалося через JSON Помилку - - + + Snapmatic Crew Snapmatic банда - - + + New Snapmatic crew: Нова Snapmatic банда: - - + + Snapmatic Title Snapmatic назва - - + + New Snapmatic title: Новий Snapmatic заголовок: @@ -2113,52 +2113,52 @@ Press 1 for Default View Видалити - + Edi&t Редагува&ти - + Show &In-game Показати &у грі - + Hide &In-game Сховати &у грі - + &Export &Експортувати - + &View &Переглянути - + &Remove &Видалити - + &Select &Виділення - + &Deselect &Зняти виділення - + Select &All Вибрати &усі - + &Deselect All &Зняти виділення усіх @@ -2377,15 +2377,15 @@ Press 1 for Default View Змінити &гравців... - - + + Show In-game Показати у грі - - + + Hide In-game Сховати у грі diff --git a/res/gta5sync_zh_TW.qm b/res/gta5sync_zh_TW.qm index e1a9e62..91252f8 100644 Binary files a/res/gta5sync_zh_TW.qm and b/res/gta5sync_zh_TW.qm differ diff --git a/res/gta5sync_zh_TW.ts b/res/gta5sync_zh_TW.ts index 09df532..d6803cd 100644 --- a/res/gta5sync_zh_TW.ts +++ b/res/gta5sync_zh_TW.ts @@ -948,37 +948,37 @@ Y: %2 - + Export as &Picture... 匯出成圖片(&P)... - + Export as &Snapmatic... 匯出成 Snapmatic(&S)... - + &Edit Properties... 編輯屬性(&E) ... - + &Overwrite Image... 修改圖片(&O)... - + Open &Map Viewer... 開啟地圖檢視器(&M)... - + Open &JSON Editor... 開啟 JSON 編輯器(&J)... @@ -1235,8 +1235,22 @@ Press 1 for Default View + + + + + + + + + + + + + + Import... 匯入... @@ -1250,20 +1264,6 @@ Press 1 for Default View - - - - - - - - - - - - - - Import 匯入 @@ -1386,109 +1386,104 @@ Press 1 for Default View 匯入 Snapmatic 圖片失敗，檔案不是 PGTA 開頭或附檔名不是 .g5e - - Failed to import the Snapmatic picture, the picture is already in the game - 匯入 Snapmatic 圖片失敗，圖片已經在遊戲中 - - - + Failed to import the Snapmatic picture, can't copy the file into profile 匯入 Snapmatic 圖片失敗，無法將該檔案複製到設定檔中 - + Failed to import the Savegame, can't copy the file into profile 匯入遊戲存檔失敗，無法將該檔案複製到設定檔中 - + Failed to import the Savegame, no Savegame slot is left 匯入遊戲存檔失敗，沒有遊戲存檔欄位 - - - - - + + + + + Export selected... 匯出所選... - - + + JPG pictures and GTA Snapmatic JPG 圖片和 GTA Snapmatic - - + + JPG pictures only 只有 JPG 圖片 - - + + GTA Snapmatic only 只有 GTA Snapmatic - + %1Export Snapmatic pictures%2<br><br>JPG pictures make it possible to open the picture with a Image Viewer<br>GTA Snapmatic make it possible to import the picture into the game<br><br>Export as: %1 匯出 Snapmatic 圖片 %2<br><br>JPG 圖片可使用圖片檢視器開啟<br>GTA Snapmatic 可以匯入到遊戲中<br><br>匯出成: - + Initialising export... 初始化... - + Export failed with... %1 %1 匯出失敗 - - + + No Snapmatic pictures or Savegames files are selected 未選擇 Snapmatic 圖片或遊戲存檔 - - - + + + Remove selected 移除所選 - + You really want remove the selected Snapmatic picutres and Savegame files? 你想移除所選的 Snapmatic 圖片/存檔嗎? - + Failed to remove all selected Snapmatic pictures and/or Savegame files 無法移除所選擇的 Snapmatic 圖片/遊戲存檔 - - - - - - + + + + + + No Snapmatic pictures are selected 未選擇 Snapmatic 圖片 - - - - - - + + + + + + %1 failed with... %2 @@ -1503,81 +1498,86 @@ Press 1 for Default View - - + + A Snapmatic picture already exists with the uid %1, you want assign your import a new uid and timestamp? + + + + + Qualify as Avatar 合格大頭貼 - - - - + + + + Patch selected... 修改所選... - - - - - - - - + + + + + + + + Patch file %1 of %2 files 修改檔案 %1 共 %2 個檔案 - + Qualify %1 failed with... 合格 - - + + Change Players... 更改玩家... - + Change Players %1 failed with... 更改玩家 - - - + + + Change Crew... 更改幫會... - + Failed to enter a valid Snapmatic Crew ID 輸入了無效的幫會 ID - + Change Crew %1 failed with... 更改幫會 - - - + + + Change Title... 更改標題... - + Failed to enter a valid Snapmatic title 輸入了無效的標題 - + Change Title %1 failed with... 更改標題 @@ -1679,37 +1679,37 @@ Press 1 for Default View 刪除 - + &View 檢視(&V) - + &Export 匯出(&E) - + &Remove 移除(&R) - + &Select 選擇(&S) - + &Deselect 取消選擇(&D) - + Select &All 選擇全部(&A) - + &Deselect All 取消選擇全部(&D) @@ -1808,7 +1808,7 @@ Press 1 for Default View - + @@ -1909,31 +1909,31 @@ Press 1 for Default View 讀寫錯誤，未能更新 Snapmatic 屬性 - + Patching of Snapmatic Properties failed because of JSON Error JSON 錯誤，未能更新 Snapmatic 屬性 - - + + Snapmatic Crew 幫會 - - + + New Snapmatic crew: 輸入新的幫會: - - + + Snapmatic Title 標題 - - + + New Snapmatic title: 輸入新的標題: @@ -2107,52 +2107,52 @@ Press 1 for Default View 刪除 - + Edi&t 編輯(&E) - + Show &In-game 在遊戲中顯示(&I) - + Hide &In-game 在遊戲中隱藏(&I) - + &Export 匯出(&E) - + &View 檢視(&V) - + &Remove 移除(&R) - + &Select 選擇(&S) - + &Deselect 取消選擇(&D) - + Select &All 選擇全部(&A) - + &Deselect All 取消選擇全部(&D) @@ -2371,15 +2371,15 @@ Press 1 for Default View 更改玩家(&P)... - - + + Show In-game 在遊戲中顯示 - - + + Hide In-game 在遊戲中隱藏