From c42cc1dc265e0628e4a011fd9137785db7bc58f8 Mon Sep 17 00:00:00 2001 From: Syping <schiedelrafael@keppe.org> Date: Fri, 28 May 2021 15:21:07 +0200 Subject: [PATCH 1/6] Add Korean strings for Desktop and Metainfo files --- res/de.syping.gta5view.desktop | 1 + res/de.syping.gta5view.metainfo.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/res/de.syping.gta5view.desktop b/res/de.syping.gta5view.desktop index 1400d5e..ed9c7d1 100644 --- a/res/de.syping.gta5view.desktop +++ b/res/de.syping.gta5view.desktop @@ -3,6 +3,7 @@ Type=Application Name=gta5view Comment=Open and edit GTA V profiles Comment[de]=GTA V Profile öffnen und bearbeiten +Comment[ko]=GTA V 프로필을 열고 편집 Comment[ru]=Просмотрщик и редактор профилей GTA V Comment[zh_TW]=打開與編輯 GTA V 個人檔案 Categories=Qt;Utility;FileTools; diff --git a/res/de.syping.gta5view.metainfo.xml b/res/de.syping.gta5view.metainfo.xml index 2af8225..ed43c28 100644 --- a/res/de.syping.gta5view.metainfo.xml +++ b/res/de.syping.gta5view.metainfo.xml @@ -10,6 +10,7 @@ <summary>Open and edit GTA V profiles</summary> <summary xml:lang="de">GTA V Profile öffnen und bearbeiten</summary> + <summary xml:lang="ko">GTA V 프로필을 열고 편집</summary> <summary xml:lang="ru">Просмотрщик и редактор профилей GTA V</summary> <summary xml:lang="zh-TW">打開與編輯 GTA V 個人檔案</summary> From 3cd6cc903db8808dfb219b1ab9e9bf94846a13dd Mon Sep 17 00:00:00 2001 From: Syping <schiedelrafael@keppe.org> Date: Thu, 17 Jun 2021 06:14:35 +0200 Subject: [PATCH 2/6] gta5view 1.10.1 release --- .ci/gta5view.nsi | 2 +- PictureDialog.cpp | 2 +- ProfileInterface.cpp | 7 +- README.md | 2 +- SnapmaticPicture.cpp | 1 + SnapmaticWidget.cpp | 2 +- UserInterface.cpp | 19 +++- config.h | 2 +- res/app.rc | 8 +- res/de.syping.gta5view.metainfo.xml | 1 + res/gta5sync.ts | 166 ++++++++++++++-------------- res/gta5sync_de.ts | 166 ++++++++++++++-------------- res/gta5sync_en_US.ts | 166 ++++++++++++++-------------- res/gta5sync_fr.ts | 166 ++++++++++++++-------------- res/gta5sync_ko.ts | 166 ++++++++++++++-------------- res/gta5sync_ru.ts | 166 ++++++++++++++-------------- res/gta5sync_uk.ts | 166 ++++++++++++++-------------- res/gta5sync_zh_TW.ts | 166 ++++++++++++++-------------- 18 files changed, 692 insertions(+), 682 deletions(-) diff --git a/.ci/gta5view.nsi b/.ci/gta5view.nsi index d99d0df..ee89b81 100644 --- a/.ci/gta5view.nsi +++ b/.ci/gta5view.nsi @@ -4,7 +4,7 @@ !define APP_EXT ".g5e" !define COMP_NAME "Syping" !define WEB_SITE "https://gta5view.syping.de/" -!define VERSION "1.10.0.0" +!define VERSION "1.10.1.0" !define COPYRIGHT "Copyright © 2016-2021 Syping" !define DESCRIPTION "Open Source Snapmatic and Savegame viewer/editor for GTA V" !define INSTALLER_NAME "gta5view_setup.exe" diff --git a/PictureDialog.cpp b/PictureDialog.cpp index 4eb48d8..99850f8 100644 --- a/PictureDialog.cpp +++ b/PictureDialog.cpp @@ -839,7 +839,7 @@ void PictureDialog::editSnapmaticImage() importDialog->exec(); if (importDialog->isImportAgreed()) { const QByteArray previousPicture = smpic->getPictureStream(); - bool success = smpic->setImage(importDialog->image()); + bool success = smpic->setImage(importDialog->image(), importDialog->isUnlimitedBuffer()); if (success) { QString currentFilePath = smpic->getPictureFilePath(); QString originalFilePath = smpic->getOriginalPictureFilePath(); diff --git a/ProfileInterface.cpp b/ProfileInterface.cpp index 68b6407..375069e 100644 --- a/ProfileInterface.cpp +++ b/ProfileInterface.cpp @@ -1792,12 +1792,11 @@ void ProfileInterface::on_saProfileContent_dropped(const QMimeData *mimeData) void ProfileInterface::retranslateUi() { ui->retranslateUi(this); - QString appVersion = GTA5SYNC_APPVER; -#ifndef GTA5SYNC_BUILDTYPE_REL + QString appVersion = QApplication::applicationVersion(); + const char* literalBuildType = GTA5SYNC_BUILDTYPE; #ifdef GTA5SYNC_COMMIT - if (!appVersion.contains("-")) + if ((strcmp(literalBuildType, REL_BUILDTYPE) != 0) && !appVersion.contains("-")) appVersion = appVersion % "-" % GTA5SYNC_COMMIT; -#endif #endif ui->labVersion->setText(QString("%1 %2").arg(GTA5SYNC_APPSTR, appVersion)); } diff --git a/README.md b/README.md index b35289a..3713ce2 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Open Source Snapmatic and Savegame viewer/editor for GTA V # Note: Install Docker Community Edition and Git before continuing git clone https://gitlab.com/Syping/gta5view && cd gta5view docker pull sypingauto/gta5view-build:1.10-static - docker run --rm -v ${PWD}:/gta5view -it sypingauto/gta5view-build:1.10-static + docker run --rm -v "$PWD:/gta5view" -it sypingauto/gta5view-build:1.10-static cd /gta5view && mkdir -p build && cd build mingw64-qt-cmake ../ make -j $(nproc --all) diff --git a/SnapmaticPicture.cpp b/SnapmaticPicture.cpp index 68b553b..3a0197b 100644 --- a/SnapmaticPicture.cpp +++ b/SnapmaticPicture.cpp @@ -199,6 +199,7 @@ bool SnapmaticPicture::setImage(const QImage &picture, bool eXtendMode) else { #ifndef GTA5SYNC_DYNAMIC_PHOTOBUFFER if (p_ragePhoto.photoBuffer() != jpegPicStreamLength) + p_ragePhoto.setPhotoData(QByteArray()); // avoid buffer set fail p_ragePhoto.setPhotoBuffer(jpegPicStreamLength, true); #endif picByteArray = picByteArrayT; diff --git a/SnapmaticWidget.cpp b/SnapmaticWidget.cpp index 9712e28..db718a7 100644 --- a/SnapmaticWidget.cpp +++ b/SnapmaticWidget.cpp @@ -357,7 +357,7 @@ void SnapmaticWidget::editSnapmaticImage() importDialog->exec(); if (importDialog->isImportAgreed()) { const QByteArray previousPicture = smpic->getPictureStream(); - bool success = smpic->setImage(importDialog->image()); + bool success = smpic->setImage(importDialog->image(), importDialog->isUnlimitedBuffer()); if (success) { QString currentFilePath = smpic->getPictureFilePath(); QString originalFilePath = smpic->getOriginalPictureFilePath(); diff --git a/UserInterface.cpp b/UserInterface.cpp index 9999908..a990b51 100644 --- a/UserInterface.cpp +++ b/UserInterface.cpp @@ -73,7 +73,12 @@ UserInterface::UserInterface(ProfileDatabase *profileDB, CrewDatabase *crewDB, D ui->menuProfile->setEnabled(false); ui->actionSelect_profile->setEnabled(false); ui->actionAbout_gta5sync->setIcon(IconLoader::loadingAppIcon()); +#ifdef Q_OS_MAC + ui->actionAbout_gta5sync->setText(QApplication::translate("MAC_APPLICATION_MENU", "About %1").arg(GTA5SYNC_APPSTR)); + ui->actionOptions->setText(QApplication::translate("MAC_APPLICATION_MENU", "Preferences...")); +#else ui->actionAbout_gta5sync->setText(tr("&About %1").arg(GTA5SYNC_APPSTR)); +#endif ui->cmdClose->setToolTip(ui->cmdClose->toolTip().arg(GTA5SYNC_APPSTR)); defaultWindowTitle = tr("%2 - %1").arg("%1", GTA5SYNC_APPSTR); @@ -873,13 +878,17 @@ void UserInterface::retranslateUi() donateAction->setText(tr("&Donate")); #endif #endif +#ifdef Q_OS_MAC + ui->actionAbout_gta5sync->setText(QApplication::translate("MAC_APPLICATION_MENU", "About %1").arg(GTA5SYNC_APPSTR)); + ui->actionOptions->setText(QApplication::translate("MAC_APPLICATION_MENU", "Preferences...")); +#else ui->actionAbout_gta5sync->setText(tr("&About %1").arg(GTA5SYNC_APPSTR)); - QString appVersion = GTA5SYNC_APPVER; -#ifndef GTA5SYNC_BUILDTYPE_REL -#ifdef GTA5SYNC_COMMIT - if (!appVersion.contains("-")) - appVersion = appVersion % "-" % GTA5SYNC_COMMIT; #endif + QString appVersion = QApplication::applicationVersion(); + const char* literalBuildType = GTA5SYNC_BUILDTYPE; +#ifdef GTA5SYNC_COMMIT + if ((strcmp(literalBuildType, REL_BUILDTYPE) != 0) && !appVersion.contains("-")) + appVersion = appVersion % "-" % GTA5SYNC_COMMIT; #endif ui->labVersion->setText(QString("%1 %2").arg(GTA5SYNC_APPSTR, appVersion)); if (profileOpen) { diff --git a/config.h b/config.h index 02e1e19..98de378 100644 --- a/config.h +++ b/config.h @@ -51,7 +51,7 @@ #endif #ifndef GTA5SYNC_APPVER -#define GTA5SYNC_APPVER "1.10.0" +#define GTA5SYNC_APPVER "1.10.1" #endif #if __cplusplus diff --git a/res/app.rc b/res/app.rc index 9bcafcb..a0fd25d 100644 --- a/res/app.rc +++ b/res/app.rc @@ -4,8 +4,8 @@ IDI_ICON1 ICON DISCARDABLE "5sync.ico" CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "gta5view.exe.manifest" #include <windows.h> VS_VERSION_INFO VERSIONINFO -FILEVERSION 1, 10, 0, 0 -PRODUCTVERSION 1, 10, 0, 0 +FILEVERSION 1, 10, 1, 0 +PRODUCTVERSION 1, 10, 1, 0 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -22,12 +22,12 @@ BEGIN BEGIN VALUE "CompanyName", "Syping" VALUE "FileDescription", "gta5view" - VALUE "FileVersion", "1.10.0" + VALUE "FileVersion", "1.10.1" VALUE "InternalName", "gta5view" VALUE "LegalCopyright", "Copyright � 2016-2021 Syping" VALUE "OriginalFilename", "gta5view.exe" VALUE "ProductName", "gta5view" - VALUE "ProductVersion", "1.10.0" + VALUE "ProductVersion", "1.10.1" END END END diff --git a/res/de.syping.gta5view.metainfo.xml b/res/de.syping.gta5view.metainfo.xml index ed43c28..9bc50a1 100644 --- a/res/de.syping.gta5view.metainfo.xml +++ b/res/de.syping.gta5view.metainfo.xml @@ -34,6 +34,7 @@ <developer_name>Syping</developer_name> <releases> + <release date="2021-06-17" version="1.10.1"/> <release date="2021-05-27" version="1.10.0"/> <release date="2021-03-22" version="1.9.2"/> <release date="2020-12-16" version="1.9.1"/> diff --git a/res/gta5sync.ts b/res/gta5sync.ts index 403fba4..88ab419 100644 --- a/res/gta5sync.ts +++ b/res/gta5sync.ts @@ -1341,7 +1341,7 @@ Press 1 for Default View</source> <location filename="../ImportDialog.cpp" line="534"/> <location filename="../ImportDialog.cpp" line="844"/> <location filename="../ProfileInterface.cpp" line="563"/> - <location filename="../UserInterface.cpp" line="590"/> + <location filename="../UserInterface.cpp" line="595"/> <source>All files (**)</source> <translation type="unfinished"></translation> </message> @@ -1386,26 +1386,26 @@ Press 1 for Default View</source> </message> <message> <location filename="../ProfileInterface.cpp" line="559"/> - <location filename="../UserInterface.cpp" line="587"/> + <location filename="../UserInterface.cpp" line="592"/> <source>GTA V Export (*.g5e)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ProfileInterface.cpp" line="560"/> - <location filename="../UserInterface.cpp" line="588"/> + <location filename="../UserInterface.cpp" line="593"/> <source>Savegames files (SGTA*)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ProfileInterface.cpp" line="561"/> - <location filename="../UserInterface.cpp" line="589"/> + <location filename="../UserInterface.cpp" line="594"/> <source>Snapmatic pictures (PGTA*)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ProfileInterface.cpp" line="583"/> <location filename="../ProfileInterface.cpp" line="974"/> - <location filename="../UserInterface.cpp" line="669"/> + <location filename="../UserInterface.cpp" line="674"/> <source>No valid file is selected</source> <translation type="unfinished"></translation> </message> @@ -1424,13 +1424,13 @@ Press 1 for Default View</source> </message> <message> <location filename="../ProfileInterface.cpp" line="676"/> - <location filename="../UserInterface.cpp" line="625"/> + <location filename="../UserInterface.cpp" line="630"/> <source>Failed to read Snapmatic picture</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ProfileInterface.cpp" line="711"/> - <location filename="../UserInterface.cpp" line="639"/> + <location filename="../UserInterface.cpp" line="644"/> <source>Failed to read Savegame file</source> <translation type="unfinished"></translation> </message> @@ -1539,20 +1539,20 @@ Press 1 for Default View</source> <message> <location filename="../ProfileInterface.cpp" line="1583"/> <location filename="../ProfileInterface.cpp" line="1613"/> - <location filename="../ProfileInterface.cpp" line="2016"/> - <location filename="../ProfileInterface.cpp" line="2095"/> - <location filename="../ProfileInterface.cpp" line="2184"/> - <location filename="../ProfileInterface.cpp" line="2299"/> + <location filename="../ProfileInterface.cpp" line="2015"/> + <location filename="../ProfileInterface.cpp" line="2094"/> + <location filename="../ProfileInterface.cpp" line="2183"/> + <location filename="../ProfileInterface.cpp" line="2298"/> <source>No Snapmatic pictures are selected</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ProfileInterface.cpp" line="1594"/> <location filename="../ProfileInterface.cpp" line="1624"/> - <location filename="../ProfileInterface.cpp" line="2076"/> - <location filename="../ProfileInterface.cpp" line="2165"/> - <location filename="../ProfileInterface.cpp" line="2280"/> - <location filename="../ProfileInterface.cpp" line="2372"/> + <location filename="../ProfileInterface.cpp" line="2075"/> + <location filename="../ProfileInterface.cpp" line="2164"/> + <location filename="../ProfileInterface.cpp" line="2279"/> + <location filename="../ProfileInterface.cpp" line="2371"/> <source>%1 failed with... %2</source> @@ -1560,87 +1560,87 @@ Press 1 for Default View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2016"/> - <location filename="../ProfileInterface.cpp" line="2076"/> + <location filename="../ProfileInterface.cpp" line="2015"/> + <location filename="../ProfileInterface.cpp" line="2075"/> <source>Qualify as Avatar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2027"/> - <location filename="../ProfileInterface.cpp" line="2120"/> - <location filename="../ProfileInterface.cpp" line="2235"/> - <location filename="../ProfileInterface.cpp" line="2330"/> + <location filename="../ProfileInterface.cpp" line="2026"/> + <location filename="../ProfileInterface.cpp" line="2119"/> + <location filename="../ProfileInterface.cpp" line="2234"/> + <location filename="../ProfileInterface.cpp" line="2329"/> <source>Patch selected...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2028"/> - <location filename="../ProfileInterface.cpp" line="2046"/> - <location filename="../ProfileInterface.cpp" line="2121"/> - <location filename="../ProfileInterface.cpp" line="2139"/> - <location filename="../ProfileInterface.cpp" line="2236"/> - <location filename="../ProfileInterface.cpp" line="2254"/> - <location filename="../ProfileInterface.cpp" line="2331"/> - <location filename="../ProfileInterface.cpp" line="2349"/> + <location filename="../ProfileInterface.cpp" line="2027"/> + <location filename="../ProfileInterface.cpp" line="2045"/> + <location filename="../ProfileInterface.cpp" line="2120"/> + <location filename="../ProfileInterface.cpp" line="2138"/> + <location filename="../ProfileInterface.cpp" line="2235"/> + <location filename="../ProfileInterface.cpp" line="2253"/> + <location filename="../ProfileInterface.cpp" line="2330"/> + <location filename="../ProfileInterface.cpp" line="2348"/> <source>Patch file %1 of %2 files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2076"/> + <location filename="../ProfileInterface.cpp" line="2075"/> <source>Qualify</source> <comment>%1 failed with...</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2095"/> - <location filename="../ProfileInterface.cpp" line="2165"/> + <location filename="../ProfileInterface.cpp" line="2094"/> + <location filename="../ProfileInterface.cpp" line="2164"/> <source>Change Players...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2165"/> + <location filename="../ProfileInterface.cpp" line="2164"/> <source>Change Players</source> <comment>%1 failed with...</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2184"/> - <location filename="../ProfileInterface.cpp" line="2214"/> - <location filename="../ProfileInterface.cpp" line="2280"/> + <location filename="../ProfileInterface.cpp" line="2183"/> + <location filename="../ProfileInterface.cpp" line="2213"/> + <location filename="../ProfileInterface.cpp" line="2279"/> <source>Change Crew...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2214"/> + <location filename="../ProfileInterface.cpp" line="2213"/> <source>Failed to enter a valid Snapmatic Crew ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2280"/> + <location filename="../ProfileInterface.cpp" line="2279"/> <source>Change Crew</source> <comment>%1 failed with...</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2299"/> - <location filename="../ProfileInterface.cpp" line="2313"/> - <location filename="../ProfileInterface.cpp" line="2372"/> + <location filename="../ProfileInterface.cpp" line="2298"/> + <location filename="../ProfileInterface.cpp" line="2312"/> + <location filename="../ProfileInterface.cpp" line="2371"/> <source>Change Title...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2313"/> + <location filename="../ProfileInterface.cpp" line="2312"/> <source>Failed to enter a valid Snapmatic title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2372"/> + <location filename="../ProfileInterface.cpp" line="2371"/> <source>Change Title</source> <comment>%1 failed with...</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../UserInterface.cpp" line="586"/> + <location filename="../UserInterface.cpp" line="591"/> <source>All profile files (*.g5e SGTA* PGTA*)</source> <translation type="unfinished"></translation> </message> @@ -1959,25 +1959,25 @@ Press 1 for Default View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2208"/> + <location filename="../ProfileInterface.cpp" line="2207"/> <location filename="../SnapmaticEditor.cpp" line="403"/> <source>Snapmatic Crew</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2208"/> + <location filename="../ProfileInterface.cpp" line="2207"/> <location filename="../SnapmaticEditor.cpp" line="403"/> <source>New Snapmatic crew:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2310"/> + <location filename="../ProfileInterface.cpp" line="2309"/> <location filename="../SnapmaticEditor.cpp" line="379"/> <source>Snapmatic Title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2310"/> + <location filename="../ProfileInterface.cpp" line="2309"/> <location filename="../SnapmaticEditor.cpp" line="379"/> <source>New Snapmatic title:</source> <translation type="unfinished"></translation> @@ -2034,19 +2034,19 @@ Press 1 for Default View</source> <name>SnapmaticPicture</name> <message> <location filename="../JsonEditorDialog.cpp" line="165"/> - <location filename="../SnapmaticPicture.cpp" line="344"/> + <location filename="../SnapmaticPicture.cpp" line="345"/> <source>JSON is incomplete and malformed</source> <translation type="unfinished"></translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="168"/> - <location filename="../SnapmaticPicture.cpp" line="347"/> + <location filename="../SnapmaticPicture.cpp" line="348"/> <source>JSON is incomplete</source> <translation type="unfinished"></translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="171"/> - <location filename="../SnapmaticPicture.cpp" line="350"/> + <location filename="../SnapmaticPicture.cpp" line="351"/> <source>JSON is malformed</source> <translation type="unfinished"></translation> </message> @@ -2056,42 +2056,42 @@ Press 1 for Default View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="314"/> + <location filename="../SnapmaticPicture.cpp" line="315"/> <source>open file %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="326"/> + <location filename="../SnapmaticPicture.cpp" line="327"/> <source>header not exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="329"/> + <location filename="../SnapmaticPicture.cpp" line="330"/> <source>header is malformed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="332"/> + <location filename="../SnapmaticPicture.cpp" line="333"/> <source>picture not exists (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="335"/> + <location filename="../SnapmaticPicture.cpp" line="336"/> <source>JSON not exists (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="338"/> + <location filename="../SnapmaticPicture.cpp" line="339"/> <source>title not exists (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="341"/> + <location filename="../SnapmaticPicture.cpp" line="342"/> <source>description not exists (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="352"/> + <location filename="../SnapmaticPicture.cpp" line="353"/> <source>reading file %1 because of %2</source> <comment>Example for %2: JSON is malformed error</comment> <translation type="unfinished"></translation> @@ -2259,7 +2259,7 @@ Press 1 for Default View</source> <name>UserInterface</name> <message> <location filename="../UserInterface.ui" line="20"/> - <location filename="../UserInterface.cpp" line="78"/> + <location filename="../UserInterface.cpp" line="83"/> <source>%2 - %1</source> <translation type="unfinished"></translation> </message> @@ -2291,9 +2291,9 @@ Press 1 for Default View</source> </message> <message> <location filename="../UserInterface.ui" line="153"/> - <location filename="../UserInterface.cpp" line="264"/> - <location filename="../UserInterface.cpp" line="288"/> - <location filename="../UserInterface.cpp" line="786"/> + <location filename="../UserInterface.cpp" line="269"/> + <location filename="../UserInterface.cpp" line="293"/> + <location filename="../UserInterface.cpp" line="791"/> <source>&Close</source> <translation type="unfinished"></translation> </message> @@ -2329,8 +2329,8 @@ Press 1 for Default View</source> </message> <message> <location filename="../UserInterface.ui" line="236"/> - <location filename="../UserInterface.cpp" line="76"/> - <location filename="../UserInterface.cpp" line="876"/> + <location filename="../UserInterface.cpp" line="80"/> + <location filename="../UserInterface.cpp" line="885"/> <source>&About %1</source> <translation type="unfinished"></translation> </message> @@ -2386,15 +2386,15 @@ Press 1 for Default View</source> </message> <message> <location filename="../UserInterface.ui" line="319"/> - <location filename="../UserInterface.cpp" line="382"/> + <location filename="../UserInterface.cpp" line="387"/> <source>Select &GTA V Folder...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../UserInterface.ui" line="322"/> <location filename="../OptionsDialog.cpp" line="704"/> - <location filename="../UserInterface.cpp" line="329"/> - <location filename="../UserInterface.cpp" line="844"/> + <location filename="../UserInterface.cpp" line="334"/> + <location filename="../UserInterface.cpp" line="849"/> <source>Select GTA V Folder...</source> <translation type="unfinished"></translation> </message> @@ -2451,53 +2451,53 @@ Press 1 for Default View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UserInterface.cpp" line="80"/> - <location filename="../UserInterface.cpp" line="445"/> - <location filename="../UserInterface.cpp" line="889"/> + <location filename="../UserInterface.cpp" line="85"/> + <location filename="../UserInterface.cpp" line="450"/> + <location filename="../UserInterface.cpp" line="898"/> <source>Select Profile</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UserInterface.cpp" line="168"/> - <location filename="../UserInterface.cpp" line="873"/> + <location filename="../UserInterface.cpp" line="173"/> + <location filename="../UserInterface.cpp" line="878"/> <source>&Donate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UserInterface.cpp" line="181"/> + <location filename="../UserInterface.cpp" line="186"/> <source>Donate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UserInterface.cpp" line="189"/> + <location filename="../UserInterface.cpp" line="194"/> <source>Donation methods</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UserInterface.cpp" line="256"/> + <location filename="../UserInterface.cpp" line="261"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UserInterface.cpp" line="583"/> + <location filename="../UserInterface.cpp" line="588"/> <source>Open File...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UserInterface.cpp" line="625"/> - <location filename="../UserInterface.cpp" line="639"/> - <location filename="../UserInterface.cpp" line="663"/> - <location filename="../UserInterface.cpp" line="669"/> + <location filename="../UserInterface.cpp" line="630"/> + <location filename="../UserInterface.cpp" line="644"/> + <location filename="../UserInterface.cpp" line="668"/> + <location filename="../UserInterface.cpp" line="674"/> <source>Open File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UserInterface.cpp" line="663"/> + <location filename="../UserInterface.cpp" line="668"/> <source>Can't open %1 because of not valid file format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UserInterface.cpp" line="751"/> + <location filename="../UserInterface.cpp" line="756"/> <source>%1 - Messages</source> <translation type="unfinished"></translation> </message> diff --git a/res/gta5sync_de.ts b/res/gta5sync_de.ts index d878c5f..054fac6 100644 --- a/res/gta5sync_de.ts +++ b/res/gta5sync_de.ts @@ -1383,13 +1383,13 @@ Drücke 1 für Standardmodus</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="560"/> - <location filename="../UserInterface.cpp" line="588"/> + <location filename="../UserInterface.cpp" line="593"/> <source>Savegames files (SGTA*)</source> <translation>Spielstanddateien (SGTA*)</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="561"/> - <location filename="../UserInterface.cpp" line="589"/> + <location filename="../UserInterface.cpp" line="594"/> <source>Snapmatic pictures (PGTA*)</source> <translation>Snapmatic Bilder (PGTA*)</translation> </message> @@ -1409,7 +1409,7 @@ Drücke 1 für Standardmodus</translation> <location filename="../ImportDialog.cpp" line="534"/> <location filename="../ImportDialog.cpp" line="844"/> <location filename="../ProfileInterface.cpp" line="563"/> - <location filename="../UserInterface.cpp" line="590"/> + <location filename="../UserInterface.cpp" line="595"/> <source>All files (**)</source> <translation>Alle Dateien (**)</translation> </message> @@ -1430,13 +1430,13 @@ Drücke 1 für Standardmodus</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="676"/> - <location filename="../UserInterface.cpp" line="625"/> + <location filename="../UserInterface.cpp" line="630"/> <source>Failed to read Snapmatic picture</source> <translation>Fehler beim Lesen vom Snapmatic Bild</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="711"/> - <location filename="../UserInterface.cpp" line="639"/> + <location filename="../UserInterface.cpp" line="644"/> <source>Failed to read Savegame file</source> <translation>Fehler beim Lesen von Spielstanddatei</translation> </message> @@ -1477,7 +1477,7 @@ Drücke 1 für Standardmodus</translation> <message> <location filename="../ProfileInterface.cpp" line="583"/> <location filename="../ProfileInterface.cpp" line="974"/> - <location filename="../UserInterface.cpp" line="669"/> + <location filename="../UserInterface.cpp" line="674"/> <source>No valid file is selected</source> <translation>Keine gültige Datei wurde ausgewählt</translation> </message> @@ -1525,38 +1525,38 @@ Drücke 1 für Standardmodus</translation> <translation>Nur GTA Snapmatic</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2027"/> - <location filename="../ProfileInterface.cpp" line="2120"/> - <location filename="../ProfileInterface.cpp" line="2235"/> - <location filename="../ProfileInterface.cpp" line="2330"/> + <location filename="../ProfileInterface.cpp" line="2026"/> + <location filename="../ProfileInterface.cpp" line="2119"/> + <location filename="../ProfileInterface.cpp" line="2234"/> + <location filename="../ProfileInterface.cpp" line="2329"/> <source>Patch selected...</source> <translation>Auswahl patchen...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2028"/> - <location filename="../ProfileInterface.cpp" line="2046"/> - <location filename="../ProfileInterface.cpp" line="2121"/> - <location filename="../ProfileInterface.cpp" line="2139"/> - <location filename="../ProfileInterface.cpp" line="2236"/> - <location filename="../ProfileInterface.cpp" line="2254"/> - <location filename="../ProfileInterface.cpp" line="2331"/> - <location filename="../ProfileInterface.cpp" line="2349"/> + <location filename="../ProfileInterface.cpp" line="2027"/> + <location filename="../ProfileInterface.cpp" line="2045"/> + <location filename="../ProfileInterface.cpp" line="2120"/> + <location filename="../ProfileInterface.cpp" line="2138"/> + <location filename="../ProfileInterface.cpp" line="2235"/> + <location filename="../ProfileInterface.cpp" line="2253"/> + <location filename="../ProfileInterface.cpp" line="2330"/> + <location filename="../ProfileInterface.cpp" line="2348"/> <source>Patch file %1 of %2 files</source> <translation>Patche Datei %1 von %2 Dateien</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2016"/> - <location filename="../ProfileInterface.cpp" line="2076"/> + <location filename="../ProfileInterface.cpp" line="2015"/> + <location filename="../ProfileInterface.cpp" line="2075"/> <source>Qualify as Avatar</source> <translation>Als Avatar qualifizieren</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="1583"/> <location filename="../ProfileInterface.cpp" line="1613"/> - <location filename="../ProfileInterface.cpp" line="2016"/> - <location filename="../ProfileInterface.cpp" line="2095"/> - <location filename="../ProfileInterface.cpp" line="2184"/> - <location filename="../ProfileInterface.cpp" line="2299"/> + <location filename="../ProfileInterface.cpp" line="2015"/> + <location filename="../ProfileInterface.cpp" line="2094"/> + <location filename="../ProfileInterface.cpp" line="2183"/> + <location filename="../ProfileInterface.cpp" line="2298"/> <source>No Snapmatic pictures are selected</source> <translation>Keine Snapmatic Bilder sind ausgewählt</translation> </message> @@ -1568,10 +1568,10 @@ Drücke 1 für Standardmodus</translation> <message> <location filename="../ProfileInterface.cpp" line="1594"/> <location filename="../ProfileInterface.cpp" line="1624"/> - <location filename="../ProfileInterface.cpp" line="2076"/> - <location filename="../ProfileInterface.cpp" line="2165"/> - <location filename="../ProfileInterface.cpp" line="2280"/> - <location filename="../ProfileInterface.cpp" line="2372"/> + <location filename="../ProfileInterface.cpp" line="2075"/> + <location filename="../ProfileInterface.cpp" line="2164"/> + <location filename="../ProfileInterface.cpp" line="2279"/> + <location filename="../ProfileInterface.cpp" line="2371"/> <source>%1 failed with... %2</source> @@ -1586,55 +1586,55 @@ Drücke 1 für Standardmodus</translation> <translation>Bereite Inhalt für Import vor...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2076"/> + <location filename="../ProfileInterface.cpp" line="2075"/> <source>Qualify</source> <comment>%1 failed with...</comment> <translation>Qualifizieren</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2095"/> - <location filename="../ProfileInterface.cpp" line="2165"/> + <location filename="../ProfileInterface.cpp" line="2094"/> + <location filename="../ProfileInterface.cpp" line="2164"/> <source>Change Players...</source> <translation>Spieler ändern...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2165"/> + <location filename="../ProfileInterface.cpp" line="2164"/> <source>Change Players</source> <comment>%1 failed with...</comment> <translation>Spieler ändern</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2184"/> - <location filename="../ProfileInterface.cpp" line="2214"/> - <location filename="../ProfileInterface.cpp" line="2280"/> + <location filename="../ProfileInterface.cpp" line="2183"/> + <location filename="../ProfileInterface.cpp" line="2213"/> + <location filename="../ProfileInterface.cpp" line="2279"/> <source>Change Crew...</source> <translation>Crew ändern...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2214"/> + <location filename="../ProfileInterface.cpp" line="2213"/> <source>Failed to enter a valid Snapmatic Crew ID</source> <translation>Fehlgeschlagen beim Eingeben von einer gültigen Crew ID</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2280"/> + <location filename="../ProfileInterface.cpp" line="2279"/> <source>Change Crew</source> <comment>%1 failed with...</comment> <translation>Crew ändern</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2299"/> - <location filename="../ProfileInterface.cpp" line="2313"/> - <location filename="../ProfileInterface.cpp" line="2372"/> + <location filename="../ProfileInterface.cpp" line="2298"/> + <location filename="../ProfileInterface.cpp" line="2312"/> + <location filename="../ProfileInterface.cpp" line="2371"/> <source>Change Title...</source> <translation>Titel ändern...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2313"/> + <location filename="../ProfileInterface.cpp" line="2312"/> <source>Failed to enter a valid Snapmatic title</source> <translation>Fehlgeschlagen beim Eingeben eines gültigen Snapmatic Titel</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2372"/> + <location filename="../ProfileInterface.cpp" line="2371"/> <source>Change Title</source> <comment>%1 failed with...</comment> <translation>Titel ändern</translation> @@ -1681,13 +1681,13 @@ Drücke 1 für Standardmodus</translation> <translation>Exportiere Datei %1 von %2 Dateien</translation> </message> <message> - <location filename="../UserInterface.cpp" line="586"/> + <location filename="../UserInterface.cpp" line="591"/> <source>All profile files (*.g5e SGTA* PGTA*)</source> <translation>Alle Profildateien (*.g5e SGTA* PGTA*)</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="559"/> - <location filename="../UserInterface.cpp" line="587"/> + <location filename="../UserInterface.cpp" line="592"/> <source>GTA V Export (*.g5e)</source> <translation>GTA V Export (*.g5e)</translation> </message> @@ -1952,7 +1952,7 @@ Drücke 1 für Standardmodus</translation> <translation>Meme</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2310"/> + <location filename="../ProfileInterface.cpp" line="2309"/> <location filename="../SnapmaticEditor.cpp" line="379"/> <source>Snapmatic Title</source> <translation>Snapmatic Titel</translation> @@ -2068,19 +2068,19 @@ Drücke 1 für Standardmodus</translation> <translation>Patchen von Snapmatic Eigenschaften fehlgeschlagen wegen I/O Fehler</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2310"/> + <location filename="../ProfileInterface.cpp" line="2309"/> <location filename="../SnapmaticEditor.cpp" line="379"/> <source>New Snapmatic title:</source> <translation>Neuer Snapmatic Titel:</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2208"/> + <location filename="../ProfileInterface.cpp" line="2207"/> <location filename="../SnapmaticEditor.cpp" line="403"/> <source>Snapmatic Crew</source> <translation>Snapmatic Crew</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2208"/> + <location filename="../ProfileInterface.cpp" line="2207"/> <location filename="../SnapmaticEditor.cpp" line="403"/> <source>New Snapmatic crew:</source> <translation>Neue Snapmatic Crew:</translation> @@ -2094,61 +2094,61 @@ Drücke 1 für Standardmodus</translation> <translation>FOTO - %1</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="314"/> + <location filename="../SnapmaticPicture.cpp" line="315"/> <source>open file %1</source> <translation>Datei öffnen %1</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="326"/> + <location filename="../SnapmaticPicture.cpp" line="327"/> <source>header not exists</source> <translation>Header nicht existiert</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="329"/> + <location filename="../SnapmaticPicture.cpp" line="330"/> <source>header is malformed</source> <translation>Header fehlerhaft ist</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="332"/> + <location filename="../SnapmaticPicture.cpp" line="333"/> <source>picture not exists (%1)</source> <translation>Bild nicht existiert (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="335"/> + <location filename="../SnapmaticPicture.cpp" line="336"/> <source>JSON not exists (%1)</source> <translation>JSON nicht existiert (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="338"/> + <location filename="../SnapmaticPicture.cpp" line="339"/> <source>title not exists (%1)</source> <translation>Titel nicht existiert (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="341"/> + <location filename="../SnapmaticPicture.cpp" line="342"/> <source>description not exists (%1)</source> <translation>Beschreibung nicht existiert (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="352"/> + <location filename="../SnapmaticPicture.cpp" line="353"/> <source>reading file %1 because of %2</source> <comment>Example for %2: JSON is malformed error</comment> <translation>Datei lesen von %1 weil %2</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="165"/> - <location filename="../SnapmaticPicture.cpp" line="344"/> + <location filename="../SnapmaticPicture.cpp" line="345"/> <source>JSON is incomplete and malformed</source> <translation>JSON ist unvollständig und Fehlerhaft</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="168"/> - <location filename="../SnapmaticPicture.cpp" line="347"/> + <location filename="../SnapmaticPicture.cpp" line="348"/> <source>JSON is incomplete</source> <translation>JSON ist unvollständig</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="171"/> - <location filename="../SnapmaticPicture.cpp" line="350"/> + <location filename="../SnapmaticPicture.cpp" line="351"/> <source>JSON is malformed</source> <translation>JSON ist Fehlerhaft</translation> </message> @@ -2414,7 +2414,7 @@ Drücke 1 für Standardmodus</translation> </message> <message> <location filename="../UserInterface.ui" line="319"/> - <location filename="../UserInterface.cpp" line="382"/> + <location filename="../UserInterface.cpp" line="387"/> <source>Select &GTA V Folder...</source> <translation>Wähle &GTA V Ordner...</translation> </message> @@ -2430,9 +2430,9 @@ Drücke 1 für Standardmodus</translation> </message> <message> <location filename="../UserInterface.ui" line="153"/> - <location filename="../UserInterface.cpp" line="264"/> - <location filename="../UserInterface.cpp" line="288"/> - <location filename="../UserInterface.cpp" line="786"/> + <location filename="../UserInterface.cpp" line="269"/> + <location filename="../UserInterface.cpp" line="293"/> + <location filename="../UserInterface.cpp" line="791"/> <source>&Close</source> <translation>S&chließen</translation> </message> @@ -2467,56 +2467,56 @@ Drücke 1 für Standardmodus</translation> <translation>Dateien &importieren...</translation> </message> <message> - <location filename="../UserInterface.cpp" line="80"/> - <location filename="../UserInterface.cpp" line="445"/> - <location filename="../UserInterface.cpp" line="889"/> + <location filename="../UserInterface.cpp" line="85"/> + <location filename="../UserInterface.cpp" line="450"/> + <location filename="../UserInterface.cpp" line="898"/> <source>Select Profile</source> <translation>Profil auswählen</translation> </message> <message> <location filename="../UserInterface.ui" line="322"/> <location filename="../OptionsDialog.cpp" line="704"/> - <location filename="../UserInterface.cpp" line="329"/> - <location filename="../UserInterface.cpp" line="844"/> + <location filename="../UserInterface.cpp" line="334"/> + <location filename="../UserInterface.cpp" line="849"/> <source>Select GTA V Folder...</source> <translation>Wähle GTA V Ordner...</translation> </message> <message> - <location filename="../UserInterface.cpp" line="583"/> + <location filename="../UserInterface.cpp" line="588"/> <source>Open File...</source> <translation>Datei öffnen...</translation> </message> <message> <location filename="../UserInterface.ui" line="20"/> - <location filename="../UserInterface.cpp" line="78"/> + <location filename="../UserInterface.cpp" line="83"/> <source>%2 - %1</source> <translation>%2 - %1</translation> </message> <message> <location filename="../UserInterface.ui" line="236"/> - <location filename="../UserInterface.cpp" line="76"/> - <location filename="../UserInterface.cpp" line="876"/> + <location filename="../UserInterface.cpp" line="80"/> + <location filename="../UserInterface.cpp" line="885"/> <source>&About %1</source> <translation>&Über %1</translation> </message> <message> - <location filename="../UserInterface.cpp" line="168"/> - <location filename="../UserInterface.cpp" line="873"/> + <location filename="../UserInterface.cpp" line="173"/> + <location filename="../UserInterface.cpp" line="878"/> <source>&Donate</source> <translation>Spen&den</translation> </message> <message> - <location filename="../UserInterface.cpp" line="181"/> + <location filename="../UserInterface.cpp" line="186"/> <source>Donate</source> <translation>Spenden</translation> </message> <message> - <location filename="../UserInterface.cpp" line="189"/> + <location filename="../UserInterface.cpp" line="194"/> <source>Donation methods</source> <translation>Spendenmethoden</translation> </message> <message> - <location filename="../UserInterface.cpp" line="256"/> + <location filename="../UserInterface.cpp" line="261"/> <source>&Copy</source> <translation>&Kopieren</translation> </message> @@ -2529,20 +2529,20 @@ Drücke 1 für Standardmodus</translation> <translation type="vanished">Kopieren</translation> </message> <message> - <location filename="../UserInterface.cpp" line="625"/> - <location filename="../UserInterface.cpp" line="639"/> - <location filename="../UserInterface.cpp" line="663"/> - <location filename="../UserInterface.cpp" line="669"/> + <location filename="../UserInterface.cpp" line="630"/> + <location filename="../UserInterface.cpp" line="644"/> + <location filename="../UserInterface.cpp" line="668"/> + <location filename="../UserInterface.cpp" line="674"/> <source>Open File</source> <translation>Datei öffnen</translation> </message> <message> - <location filename="../UserInterface.cpp" line="663"/> + <location filename="../UserInterface.cpp" line="668"/> <source>Can't open %1 because of not valid file format</source> <translation>Kann nicht %1 öffnen weil Dateiformat nicht gültig ist</translation> </message> <message> - <location filename="../UserInterface.cpp" line="751"/> + <location filename="../UserInterface.cpp" line="756"/> <source>%1 - Messages</source> <translation>%1 - Nachrichten</translation> </message> diff --git a/res/gta5sync_en_US.ts b/res/gta5sync_en_US.ts index 766a167..1b4c531 100644 --- a/res/gta5sync_en_US.ts +++ b/res/gta5sync_en_US.ts @@ -1357,19 +1357,19 @@ Press 1 for Default View</source> </message> <message> <location filename="../ProfileInterface.cpp" line="559"/> - <location filename="../UserInterface.cpp" line="587"/> + <location filename="../UserInterface.cpp" line="592"/> <source>GTA V Export (*.g5e)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ProfileInterface.cpp" line="560"/> - <location filename="../UserInterface.cpp" line="588"/> + <location filename="../UserInterface.cpp" line="593"/> <source>Savegames files (SGTA*)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ProfileInterface.cpp" line="561"/> - <location filename="../UserInterface.cpp" line="589"/> + <location filename="../UserInterface.cpp" line="594"/> <source>Snapmatic pictures (PGTA*)</source> <translation type="unfinished"></translation> </message> @@ -1384,14 +1384,14 @@ Press 1 for Default View</source> <location filename="../ImportDialog.cpp" line="534"/> <location filename="../ImportDialog.cpp" line="844"/> <location filename="../ProfileInterface.cpp" line="563"/> - <location filename="../UserInterface.cpp" line="590"/> + <location filename="../UserInterface.cpp" line="595"/> <source>All files (**)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ProfileInterface.cpp" line="583"/> <location filename="../ProfileInterface.cpp" line="974"/> - <location filename="../UserInterface.cpp" line="669"/> + <location filename="../UserInterface.cpp" line="674"/> <source>No valid file is selected</source> <translation type="unfinished"></translation> </message> @@ -1410,13 +1410,13 @@ Press 1 for Default View</source> </message> <message> <location filename="../ProfileInterface.cpp" line="676"/> - <location filename="../UserInterface.cpp" line="625"/> + <location filename="../UserInterface.cpp" line="630"/> <source>Failed to read Snapmatic picture</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ProfileInterface.cpp" line="711"/> - <location filename="../UserInterface.cpp" line="639"/> + <location filename="../UserInterface.cpp" line="644"/> <source>Failed to read Savegame file</source> <translation type="unfinished"></translation> </message> @@ -1522,48 +1522,48 @@ Press 1 for Default View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2016"/> - <location filename="../ProfileInterface.cpp" line="2076"/> + <location filename="../ProfileInterface.cpp" line="2015"/> + <location filename="../ProfileInterface.cpp" line="2075"/> <source>Qualify as Avatar</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ProfileInterface.cpp" line="1583"/> <location filename="../ProfileInterface.cpp" line="1613"/> - <location filename="../ProfileInterface.cpp" line="2016"/> - <location filename="../ProfileInterface.cpp" line="2095"/> - <location filename="../ProfileInterface.cpp" line="2184"/> - <location filename="../ProfileInterface.cpp" line="2299"/> + <location filename="../ProfileInterface.cpp" line="2015"/> + <location filename="../ProfileInterface.cpp" line="2094"/> + <location filename="../ProfileInterface.cpp" line="2183"/> + <location filename="../ProfileInterface.cpp" line="2298"/> <source>No Snapmatic pictures are selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2027"/> - <location filename="../ProfileInterface.cpp" line="2120"/> - <location filename="../ProfileInterface.cpp" line="2235"/> - <location filename="../ProfileInterface.cpp" line="2330"/> + <location filename="../ProfileInterface.cpp" line="2026"/> + <location filename="../ProfileInterface.cpp" line="2119"/> + <location filename="../ProfileInterface.cpp" line="2234"/> + <location filename="../ProfileInterface.cpp" line="2329"/> <source>Patch selected...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2028"/> - <location filename="../ProfileInterface.cpp" line="2046"/> - <location filename="../ProfileInterface.cpp" line="2121"/> - <location filename="../ProfileInterface.cpp" line="2139"/> - <location filename="../ProfileInterface.cpp" line="2236"/> - <location filename="../ProfileInterface.cpp" line="2254"/> - <location filename="../ProfileInterface.cpp" line="2331"/> - <location filename="../ProfileInterface.cpp" line="2349"/> + <location filename="../ProfileInterface.cpp" line="2027"/> + <location filename="../ProfileInterface.cpp" line="2045"/> + <location filename="../ProfileInterface.cpp" line="2120"/> + <location filename="../ProfileInterface.cpp" line="2138"/> + <location filename="../ProfileInterface.cpp" line="2235"/> + <location filename="../ProfileInterface.cpp" line="2253"/> + <location filename="../ProfileInterface.cpp" line="2330"/> + <location filename="../ProfileInterface.cpp" line="2348"/> <source>Patch file %1 of %2 files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ProfileInterface.cpp" line="1594"/> <location filename="../ProfileInterface.cpp" line="1624"/> - <location filename="../ProfileInterface.cpp" line="2076"/> - <location filename="../ProfileInterface.cpp" line="2165"/> - <location filename="../ProfileInterface.cpp" line="2280"/> - <location filename="../ProfileInterface.cpp" line="2372"/> + <location filename="../ProfileInterface.cpp" line="2075"/> + <location filename="../ProfileInterface.cpp" line="2164"/> + <location filename="../ProfileInterface.cpp" line="2279"/> + <location filename="../ProfileInterface.cpp" line="2371"/> <source>%1 failed with... %2</source> @@ -1586,61 +1586,61 @@ Press 1 for Default View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2076"/> + <location filename="../ProfileInterface.cpp" line="2075"/> <source>Qualify</source> <comment>%1 failed with...</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2095"/> - <location filename="../ProfileInterface.cpp" line="2165"/> + <location filename="../ProfileInterface.cpp" line="2094"/> + <location filename="../ProfileInterface.cpp" line="2164"/> <source>Change Players...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2165"/> + <location filename="../ProfileInterface.cpp" line="2164"/> <source>Change Players</source> <comment>%1 failed with...</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2184"/> - <location filename="../ProfileInterface.cpp" line="2214"/> - <location filename="../ProfileInterface.cpp" line="2280"/> + <location filename="../ProfileInterface.cpp" line="2183"/> + <location filename="../ProfileInterface.cpp" line="2213"/> + <location filename="../ProfileInterface.cpp" line="2279"/> <source>Change Crew...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2214"/> + <location filename="../ProfileInterface.cpp" line="2213"/> <source>Failed to enter a valid Snapmatic Crew ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2280"/> + <location filename="../ProfileInterface.cpp" line="2279"/> <source>Change Crew</source> <comment>%1 failed with...</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2299"/> - <location filename="../ProfileInterface.cpp" line="2313"/> - <location filename="../ProfileInterface.cpp" line="2372"/> + <location filename="../ProfileInterface.cpp" line="2298"/> + <location filename="../ProfileInterface.cpp" line="2312"/> + <location filename="../ProfileInterface.cpp" line="2371"/> <source>Change Title...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2313"/> + <location filename="../ProfileInterface.cpp" line="2312"/> <source>Failed to enter a valid Snapmatic title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2372"/> + <location filename="../ProfileInterface.cpp" line="2371"/> <source>Change Title</source> <comment>%1 failed with...</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../UserInterface.cpp" line="586"/> + <location filename="../UserInterface.cpp" line="591"/> <source>All profile files (*.g5e SGTA* PGTA*)</source> <translation type="unfinished"></translation> </message> @@ -2006,25 +2006,25 @@ Press 1 for Default View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2310"/> + <location filename="../ProfileInterface.cpp" line="2309"/> <location filename="../SnapmaticEditor.cpp" line="379"/> <source>Snapmatic Title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2310"/> + <location filename="../ProfileInterface.cpp" line="2309"/> <location filename="../SnapmaticEditor.cpp" line="379"/> <source>New Snapmatic title:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2208"/> + <location filename="../ProfileInterface.cpp" line="2207"/> <location filename="../SnapmaticEditor.cpp" line="403"/> <source>Snapmatic Crew</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2208"/> + <location filename="../ProfileInterface.cpp" line="2207"/> <location filename="../SnapmaticEditor.cpp" line="403"/> <source>New Snapmatic crew:</source> <translation type="unfinished"></translation> @@ -2038,61 +2038,61 @@ Press 1 for Default View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="314"/> + <location filename="../SnapmaticPicture.cpp" line="315"/> <source>open file %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="326"/> + <location filename="../SnapmaticPicture.cpp" line="327"/> <source>header not exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="329"/> + <location filename="../SnapmaticPicture.cpp" line="330"/> <source>header is malformed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="332"/> + <location filename="../SnapmaticPicture.cpp" line="333"/> <source>picture not exists (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="335"/> + <location filename="../SnapmaticPicture.cpp" line="336"/> <source>JSON not exists (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="338"/> + <location filename="../SnapmaticPicture.cpp" line="339"/> <source>title not exists (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="341"/> + <location filename="../SnapmaticPicture.cpp" line="342"/> <source>description not exists (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="352"/> + <location filename="../SnapmaticPicture.cpp" line="353"/> <source>reading file %1 because of %2</source> <comment>Example for %2: JSON is malformed error</comment> <translation type="unfinished"></translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="165"/> - <location filename="../SnapmaticPicture.cpp" line="344"/> + <location filename="../SnapmaticPicture.cpp" line="345"/> <source>JSON is incomplete and malformed</source> <translation type="unfinished"></translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="168"/> - <location filename="../SnapmaticPicture.cpp" line="347"/> + <location filename="../SnapmaticPicture.cpp" line="348"/> <source>JSON is incomplete</source> <translation type="unfinished"></translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="171"/> - <location filename="../SnapmaticPicture.cpp" line="350"/> + <location filename="../SnapmaticPicture.cpp" line="351"/> <source>JSON is malformed</source> <translation type="unfinished"></translation> </message> @@ -2259,7 +2259,7 @@ Press 1 for Default View</source> <name>UserInterface</name> <message> <location filename="../UserInterface.ui" line="20"/> - <location filename="../UserInterface.cpp" line="78"/> + <location filename="../UserInterface.cpp" line="83"/> <source>%2 - %1</source> <translation type="unfinished"></translation> </message> @@ -2291,9 +2291,9 @@ Press 1 for Default View</source> </message> <message> <location filename="../UserInterface.ui" line="153"/> - <location filename="../UserInterface.cpp" line="264"/> - <location filename="../UserInterface.cpp" line="288"/> - <location filename="../UserInterface.cpp" line="786"/> + <location filename="../UserInterface.cpp" line="269"/> + <location filename="../UserInterface.cpp" line="293"/> + <location filename="../UserInterface.cpp" line="791"/> <source>&Close</source> <translation type="unfinished"></translation> </message> @@ -2324,8 +2324,8 @@ Press 1 for Default View</source> </message> <message> <location filename="../UserInterface.ui" line="236"/> - <location filename="../UserInterface.cpp" line="76"/> - <location filename="../UserInterface.cpp" line="876"/> + <location filename="../UserInterface.cpp" line="80"/> + <location filename="../UserInterface.cpp" line="885"/> <source>&About %1</source> <translation type="unfinished"></translation> </message> @@ -2381,15 +2381,15 @@ Press 1 for Default View</source> </message> <message> <location filename="../UserInterface.ui" line="319"/> - <location filename="../UserInterface.cpp" line="382"/> + <location filename="../UserInterface.cpp" line="387"/> <source>Select &GTA V Folder...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../UserInterface.ui" line="322"/> <location filename="../OptionsDialog.cpp" line="704"/> - <location filename="../UserInterface.cpp" line="329"/> - <location filename="../UserInterface.cpp" line="844"/> + <location filename="../UserInterface.cpp" line="334"/> + <location filename="../UserInterface.cpp" line="849"/> <source>Select GTA V Folder...</source> <translation type="unfinished"></translation> </message> @@ -2437,53 +2437,53 @@ Press 1 for Default View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UserInterface.cpp" line="80"/> - <location filename="../UserInterface.cpp" line="445"/> - <location filename="../UserInterface.cpp" line="889"/> + <location filename="../UserInterface.cpp" line="85"/> + <location filename="../UserInterface.cpp" line="450"/> + <location filename="../UserInterface.cpp" line="898"/> <source>Select Profile</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UserInterface.cpp" line="168"/> - <location filename="../UserInterface.cpp" line="873"/> + <location filename="../UserInterface.cpp" line="173"/> + <location filename="../UserInterface.cpp" line="878"/> <source>&Donate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UserInterface.cpp" line="181"/> + <location filename="../UserInterface.cpp" line="186"/> <source>Donate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UserInterface.cpp" line="189"/> + <location filename="../UserInterface.cpp" line="194"/> <source>Donation methods</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UserInterface.cpp" line="256"/> + <location filename="../UserInterface.cpp" line="261"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UserInterface.cpp" line="583"/> + <location filename="../UserInterface.cpp" line="588"/> <source>Open File...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UserInterface.cpp" line="625"/> - <location filename="../UserInterface.cpp" line="639"/> - <location filename="../UserInterface.cpp" line="663"/> - <location filename="../UserInterface.cpp" line="669"/> + <location filename="../UserInterface.cpp" line="630"/> + <location filename="../UserInterface.cpp" line="644"/> + <location filename="../UserInterface.cpp" line="668"/> + <location filename="../UserInterface.cpp" line="674"/> <source>Open File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UserInterface.cpp" line="663"/> + <location filename="../UserInterface.cpp" line="668"/> <source>Can't open %1 because of not valid file format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UserInterface.cpp" line="751"/> + <location filename="../UserInterface.cpp" line="756"/> <source>%1 - Messages</source> <translation type="unfinished"></translation> </message> diff --git a/res/gta5sync_fr.ts b/res/gta5sync_fr.ts index 305c0a0..7e90ba6 100644 --- a/res/gta5sync_fr.ts +++ b/res/gta5sync_fr.ts @@ -1391,13 +1391,13 @@ Appuyer sur 1 pour le mode par défaut</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="560"/> - <location filename="../UserInterface.cpp" line="588"/> + <location filename="../UserInterface.cpp" line="593"/> <source>Savegames files (SGTA*)</source> <translation>Fichiers de sauvegarde GTA (SGTA*)</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="561"/> - <location filename="../UserInterface.cpp" line="589"/> + <location filename="../UserInterface.cpp" line="594"/> <source>Snapmatic pictures (PGTA*)</source> <translation>Photos Snapmatic (PGTA*)</translation> </message> @@ -1412,7 +1412,7 @@ Appuyer sur 1 pour le mode par défaut</translation> <location filename="../ImportDialog.cpp" line="534"/> <location filename="../ImportDialog.cpp" line="844"/> <location filename="../ProfileInterface.cpp" line="563"/> - <location filename="../UserInterface.cpp" line="590"/> + <location filename="../UserInterface.cpp" line="595"/> <source>All files (**)</source> <translation>Tous les fichiers (**)</translation> </message> @@ -1434,7 +1434,7 @@ Appuyer sur 1 pour le mode par défaut</translation> <message> <location filename="../ProfileInterface.cpp" line="583"/> <location filename="../ProfileInterface.cpp" line="974"/> - <location filename="../UserInterface.cpp" line="669"/> + <location filename="../UserInterface.cpp" line="674"/> <source>No valid file is selected</source> <translation>Fichier invalide</translation> </message> @@ -1445,13 +1445,13 @@ Appuyer sur 1 pour le mode par défaut</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="676"/> - <location filename="../UserInterface.cpp" line="625"/> + <location filename="../UserInterface.cpp" line="630"/> <source>Failed to read Snapmatic picture</source> <translation>Impossible d'ouvrir la photo Snapmatic</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="711"/> - <location filename="../UserInterface.cpp" line="639"/> + <location filename="../UserInterface.cpp" line="644"/> <source>Failed to read Savegame file</source> <translation>Impossible de lire le fichier de sauvegarde</translation> </message> @@ -1532,48 +1532,48 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation>Initialisation de l'export...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2016"/> - <location filename="../ProfileInterface.cpp" line="2076"/> + <location filename="../ProfileInterface.cpp" line="2015"/> + <location filename="../ProfileInterface.cpp" line="2075"/> <source>Qualify as Avatar</source> <translation>Qualifier comme Avatar</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="1583"/> <location filename="../ProfileInterface.cpp" line="1613"/> - <location filename="../ProfileInterface.cpp" line="2016"/> - <location filename="../ProfileInterface.cpp" line="2095"/> - <location filename="../ProfileInterface.cpp" line="2184"/> - <location filename="../ProfileInterface.cpp" line="2299"/> + <location filename="../ProfileInterface.cpp" line="2015"/> + <location filename="../ProfileInterface.cpp" line="2094"/> + <location filename="../ProfileInterface.cpp" line="2183"/> + <location filename="../ProfileInterface.cpp" line="2298"/> <source>No Snapmatic pictures are selected</source> <translation>Aucun Snapmatic sélectionné</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2027"/> - <location filename="../ProfileInterface.cpp" line="2120"/> - <location filename="../ProfileInterface.cpp" line="2235"/> - <location filename="../ProfileInterface.cpp" line="2330"/> + <location filename="../ProfileInterface.cpp" line="2026"/> + <location filename="../ProfileInterface.cpp" line="2119"/> + <location filename="../ProfileInterface.cpp" line="2234"/> + <location filename="../ProfileInterface.cpp" line="2329"/> <source>Patch selected...</source> <translation>Patcher la sélection...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2028"/> - <location filename="../ProfileInterface.cpp" line="2046"/> - <location filename="../ProfileInterface.cpp" line="2121"/> - <location filename="../ProfileInterface.cpp" line="2139"/> - <location filename="../ProfileInterface.cpp" line="2236"/> - <location filename="../ProfileInterface.cpp" line="2254"/> - <location filename="../ProfileInterface.cpp" line="2331"/> - <location filename="../ProfileInterface.cpp" line="2349"/> + <location filename="../ProfileInterface.cpp" line="2027"/> + <location filename="../ProfileInterface.cpp" line="2045"/> + <location filename="../ProfileInterface.cpp" line="2120"/> + <location filename="../ProfileInterface.cpp" line="2138"/> + <location filename="../ProfileInterface.cpp" line="2235"/> + <location filename="../ProfileInterface.cpp" line="2253"/> + <location filename="../ProfileInterface.cpp" line="2330"/> + <location filename="../ProfileInterface.cpp" line="2348"/> <source>Patch file %1 of %2 files</source> <translation>Patch du fichier %1 sur %2</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="1594"/> <location filename="../ProfileInterface.cpp" line="1624"/> - <location filename="../ProfileInterface.cpp" line="2076"/> - <location filename="../ProfileInterface.cpp" line="2165"/> - <location filename="../ProfileInterface.cpp" line="2280"/> - <location filename="../ProfileInterface.cpp" line="2372"/> + <location filename="../ProfileInterface.cpp" line="2075"/> + <location filename="../ProfileInterface.cpp" line="2164"/> + <location filename="../ProfileInterface.cpp" line="2279"/> + <location filename="../ProfileInterface.cpp" line="2371"/> <source>%1 failed with... %2</source> @@ -1598,55 +1598,55 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation>Un Snapmatic existe déjà avec le uid %1, voulez-vous assigner à votre import un nouvel uid et timestamp ?</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2076"/> + <location filename="../ProfileInterface.cpp" line="2075"/> <source>Qualify</source> <comment>%1 failed with...</comment> <translation>Qualifier</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2095"/> - <location filename="../ProfileInterface.cpp" line="2165"/> + <location filename="../ProfileInterface.cpp" line="2094"/> + <location filename="../ProfileInterface.cpp" line="2164"/> <source>Change Players...</source> <translation>Modifier les joueurs...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2165"/> + <location filename="../ProfileInterface.cpp" line="2164"/> <source>Change Players</source> <comment>%1 failed with...</comment> <translation>Modifier les joueurs</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2184"/> - <location filename="../ProfileInterface.cpp" line="2214"/> - <location filename="../ProfileInterface.cpp" line="2280"/> + <location filename="../ProfileInterface.cpp" line="2183"/> + <location filename="../ProfileInterface.cpp" line="2213"/> + <location filename="../ProfileInterface.cpp" line="2279"/> <source>Change Crew...</source> <translation>Modifier le Crew...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2214"/> + <location filename="../ProfileInterface.cpp" line="2213"/> <source>Failed to enter a valid Snapmatic Crew ID</source> <translation>Snapmatic Crew ID invalide</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2280"/> + <location filename="../ProfileInterface.cpp" line="2279"/> <source>Change Crew</source> <comment>%1 failed with...</comment> <translation>Changer le Crew</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2299"/> - <location filename="../ProfileInterface.cpp" line="2313"/> - <location filename="../ProfileInterface.cpp" line="2372"/> + <location filename="../ProfileInterface.cpp" line="2298"/> + <location filename="../ProfileInterface.cpp" line="2312"/> + <location filename="../ProfileInterface.cpp" line="2371"/> <source>Change Title...</source> <translation>Changer le titre...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2313"/> + <location filename="../ProfileInterface.cpp" line="2312"/> <source>Failed to enter a valid Snapmatic title</source> <translation>Titre Snapmatic invalide</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2372"/> + <location filename="../ProfileInterface.cpp" line="2371"/> <source>Change Title</source> <comment>%1 failed with...</comment> <translation>Changer le titre</translation> @@ -1679,13 +1679,13 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation>Supprimer la sélection ?</translation> </message> <message> - <location filename="../UserInterface.cpp" line="586"/> + <location filename="../UserInterface.cpp" line="591"/> <source>All profile files (*.g5e SGTA* PGTA*)</source> <translation>Tous les fichiers de profil (*.g5e SGTA* PGTA*)</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="559"/> - <location filename="../UserInterface.cpp" line="587"/> + <location filename="../UserInterface.cpp" line="592"/> <source>GTA V Export (*.g5e)</source> <translation>GTA V Export (*.g5e)</translation> </message> @@ -1958,7 +1958,7 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation>Meme</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2310"/> + <location filename="../ProfileInterface.cpp" line="2309"/> <location filename="../SnapmaticEditor.cpp" line="379"/> <source>Snapmatic Title</source> <translation>Titre Snapmatic</translation> @@ -2076,19 +2076,19 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation>La modification des propriétés Snapmatic a échoué : erreur d'entrée/sortie</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2310"/> + <location filename="../ProfileInterface.cpp" line="2309"/> <location filename="../SnapmaticEditor.cpp" line="379"/> <source>New Snapmatic title:</source> <translation>Nouveau titre Snapmatic :</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2208"/> + <location filename="../ProfileInterface.cpp" line="2207"/> <location filename="../SnapmaticEditor.cpp" line="403"/> <source>Snapmatic Crew</source> <translation>Crew Snapmatic</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2208"/> + <location filename="../ProfileInterface.cpp" line="2207"/> <location filename="../SnapmaticEditor.cpp" line="403"/> <source>New Snapmatic crew:</source> <translation>Nouveau crew Snapmatic :</translation> @@ -2102,61 +2102,61 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation>PHOTO - %1</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="314"/> + <location filename="../SnapmaticPicture.cpp" line="315"/> <source>open file %1</source> <translation>ouverture du fichier %1</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="326"/> + <location filename="../SnapmaticPicture.cpp" line="327"/> <source>header not exists</source> <translation>les headers n'existent pas</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="329"/> + <location filename="../SnapmaticPicture.cpp" line="330"/> <source>header is malformed</source> <translation>les headers sont incorrects</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="332"/> + <location filename="../SnapmaticPicture.cpp" line="333"/> <source>picture not exists (%1)</source> <translation>l'image n'existe pas (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="335"/> + <location filename="../SnapmaticPicture.cpp" line="336"/> <source>JSON not exists (%1)</source> <translation>le JSON n'existe pas (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="338"/> + <location filename="../SnapmaticPicture.cpp" line="339"/> <source>title not exists (%1)</source> <translation>le titre n'existe pas (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="341"/> + <location filename="../SnapmaticPicture.cpp" line="342"/> <source>description not exists (%1)</source> <translation>la description n'existe pas (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="352"/> + <location filename="../SnapmaticPicture.cpp" line="353"/> <source>reading file %1 because of %2</source> <comment>Example for %2: JSON is malformed error</comment> <translation>lecture du fichier %1 : %2</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="165"/> - <location filename="../SnapmaticPicture.cpp" line="344"/> + <location filename="../SnapmaticPicture.cpp" line="345"/> <source>JSON is incomplete and malformed</source> <translation>JSON incomplet ou incorrect</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="168"/> - <location filename="../SnapmaticPicture.cpp" line="347"/> + <location filename="../SnapmaticPicture.cpp" line="348"/> <source>JSON is incomplete</source> <translation>JSON incomplet</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="171"/> - <location filename="../SnapmaticPicture.cpp" line="350"/> + <location filename="../SnapmaticPicture.cpp" line="351"/> <source>JSON is malformed</source> <translation>JSON incorrect</translation> </message> @@ -2349,9 +2349,9 @@ Appuyer sur 1 pour le mode par défaut</translation> </message> <message> <location filename="../UserInterface.ui" line="153"/> - <location filename="../UserInterface.cpp" line="264"/> - <location filename="../UserInterface.cpp" line="288"/> - <location filename="../UserInterface.cpp" line="786"/> + <location filename="../UserInterface.cpp" line="269"/> + <location filename="../UserInterface.cpp" line="293"/> + <location filename="../UserInterface.cpp" line="791"/> <source>&Close</source> <translation>Fer&mer</translation> </message> @@ -2427,15 +2427,15 @@ Appuyer sur 1 pour le mode par défaut</translation> </message> <message> <location filename="../UserInterface.ui" line="319"/> - <location filename="../UserInterface.cpp" line="382"/> + <location filename="../UserInterface.cpp" line="387"/> <source>Select &GTA V Folder...</source> <translation>Modifier l'emplacement de &GTA V...</translation> </message> <message> <location filename="../UserInterface.ui" line="322"/> <location filename="../OptionsDialog.cpp" line="704"/> - <location filename="../UserInterface.cpp" line="329"/> - <location filename="../UserInterface.cpp" line="844"/> + <location filename="../UserInterface.cpp" line="334"/> + <location filename="../UserInterface.cpp" line="849"/> <source>Select GTA V Folder...</source> <translation>Modifier l'emplacement de GTA V...</translation> </message> @@ -2489,37 +2489,37 @@ Appuyer sur 1 pour le mode par défaut</translation> </message> <message> <location filename="../UserInterface.ui" line="20"/> - <location filename="../UserInterface.cpp" line="78"/> + <location filename="../UserInterface.cpp" line="83"/> <source>%2 - %1</source> <translation>%2 - %1</translation> </message> <message> <location filename="../UserInterface.ui" line="236"/> - <location filename="../UserInterface.cpp" line="76"/> - <location filename="../UserInterface.cpp" line="876"/> + <location filename="../UserInterface.cpp" line="80"/> + <location filename="../UserInterface.cpp" line="885"/> <source>&About %1</source> <translation>&À propos de %1</translation> </message> <message> - <location filename="../UserInterface.cpp" line="80"/> - <location filename="../UserInterface.cpp" line="445"/> - <location filename="../UserInterface.cpp" line="889"/> + <location filename="../UserInterface.cpp" line="85"/> + <location filename="../UserInterface.cpp" line="450"/> + <location filename="../UserInterface.cpp" line="898"/> <source>Select Profile</source> <translation>Sélectionner un profil</translation> </message> <message> - <location filename="../UserInterface.cpp" line="168"/> - <location filename="../UserInterface.cpp" line="873"/> + <location filename="../UserInterface.cpp" line="173"/> + <location filename="../UserInterface.cpp" line="878"/> <source>&Donate</source> <translation>&Don</translation> </message> <message> - <location filename="../UserInterface.cpp" line="181"/> + <location filename="../UserInterface.cpp" line="186"/> <source>Donate</source> <translation>Don</translation> </message> <message> - <location filename="../UserInterface.cpp" line="189"/> + <location filename="../UserInterface.cpp" line="194"/> <source>Donation methods</source> <translation>Méthodes de don</translation> </message> @@ -2532,30 +2532,30 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation type="vanished">Copier</translation> </message> <message> - <location filename="../UserInterface.cpp" line="256"/> + <location filename="../UserInterface.cpp" line="261"/> <source>&Copy</source> <translation>&Copier</translation> </message> <message> - <location filename="../UserInterface.cpp" line="583"/> + <location filename="../UserInterface.cpp" line="588"/> <source>Open File...</source> <translation>Ouvrir...</translation> </message> <message> - <location filename="../UserInterface.cpp" line="625"/> - <location filename="../UserInterface.cpp" line="639"/> - <location filename="../UserInterface.cpp" line="663"/> - <location filename="../UserInterface.cpp" line="669"/> + <location filename="../UserInterface.cpp" line="630"/> + <location filename="../UserInterface.cpp" line="644"/> + <location filename="../UserInterface.cpp" line="668"/> + <location filename="../UserInterface.cpp" line="674"/> <source>Open File</source> <translation>Ouvrir</translation> </message> <message> - <location filename="../UserInterface.cpp" line="663"/> + <location filename="../UserInterface.cpp" line="668"/> <source>Can't open %1 because of not valid file format</source> <translation>Impossible d'ouvrir %1, format invalide</translation> </message> <message> - <location filename="../UserInterface.cpp" line="751"/> + <location filename="../UserInterface.cpp" line="756"/> <source>%1 - Messages</source> <translation>%1 - Nouvelles</translation> </message> diff --git a/res/gta5sync_ko.ts b/res/gta5sync_ko.ts index 396eb77..d2ebaa3 100644 --- a/res/gta5sync_ko.ts +++ b/res/gta5sync_ko.ts @@ -1397,7 +1397,7 @@ Press 1 for Default View</source> <location filename="../ImportDialog.cpp" line="534"/> <location filename="../ImportDialog.cpp" line="844"/> <location filename="../ProfileInterface.cpp" line="563"/> - <location filename="../UserInterface.cpp" line="590"/> + <location filename="../UserInterface.cpp" line="595"/> <source>All files (**)</source> <translation>모든 파일 (**)</translation> </message> @@ -1442,26 +1442,26 @@ Press 1 for Default View</source> </message> <message> <location filename="../ProfileInterface.cpp" line="559"/> - <location filename="../UserInterface.cpp" line="587"/> + <location filename="../UserInterface.cpp" line="592"/> <source>GTA V Export (*.g5e)</source> <translation>GTA V로 내보내기 (*.g5e)</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="560"/> - <location filename="../UserInterface.cpp" line="588"/> + <location filename="../UserInterface.cpp" line="593"/> <source>Savegames files (SGTA*)</source> <translation>세이브 파일 (SGTA*)</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="561"/> - <location filename="../UserInterface.cpp" line="589"/> + <location filename="../UserInterface.cpp" line="594"/> <source>Snapmatic pictures (PGTA*)</source> <translation>스냅매틱 이미지 (PGTA*)</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="583"/> <location filename="../ProfileInterface.cpp" line="974"/> - <location filename="../UserInterface.cpp" line="669"/> + <location filename="../UserInterface.cpp" line="674"/> <source>No valid file is selected</source> <translation>올바른 파일이 선택되지 않았습니다.</translation> </message> @@ -1482,13 +1482,13 @@ Press 1 for Default View</source> </message> <message> <location filename="../ProfileInterface.cpp" line="676"/> - <location filename="../UserInterface.cpp" line="625"/> + <location filename="../UserInterface.cpp" line="630"/> <source>Failed to read Snapmatic picture</source> <translation>스냅매틱 이미지를 읽지 못했습니다.</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="711"/> - <location filename="../UserInterface.cpp" line="639"/> + <location filename="../UserInterface.cpp" line="644"/> <source>Failed to read Savegame file</source> <translation>세이브 파일을 읽지 못했습니다.</translation> </message> @@ -1599,20 +1599,20 @@ Press 1 for Default View</source> <message> <location filename="../ProfileInterface.cpp" line="1583"/> <location filename="../ProfileInterface.cpp" line="1613"/> - <location filename="../ProfileInterface.cpp" line="2016"/> - <location filename="../ProfileInterface.cpp" line="2095"/> - <location filename="../ProfileInterface.cpp" line="2184"/> - <location filename="../ProfileInterface.cpp" line="2299"/> + <location filename="../ProfileInterface.cpp" line="2015"/> + <location filename="../ProfileInterface.cpp" line="2094"/> + <location filename="../ProfileInterface.cpp" line="2183"/> + <location filename="../ProfileInterface.cpp" line="2298"/> <source>No Snapmatic pictures are selected</source> <translation>스냅매틱 이미지가 선택되지 않았습니다.</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="1594"/> <location filename="../ProfileInterface.cpp" line="1624"/> - <location filename="../ProfileInterface.cpp" line="2076"/> - <location filename="../ProfileInterface.cpp" line="2165"/> - <location filename="../ProfileInterface.cpp" line="2280"/> - <location filename="../ProfileInterface.cpp" line="2372"/> + <location filename="../ProfileInterface.cpp" line="2075"/> + <location filename="../ProfileInterface.cpp" line="2164"/> + <location filename="../ProfileInterface.cpp" line="2279"/> + <location filename="../ProfileInterface.cpp" line="2371"/> <source>%1 failed with... %2</source> @@ -1623,91 +1623,91 @@ Press 1 for Default View</source> %2</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2016"/> - <location filename="../ProfileInterface.cpp" line="2076"/> + <location filename="../ProfileInterface.cpp" line="2015"/> + <location filename="../ProfileInterface.cpp" line="2075"/> <source>Qualify as Avatar</source> <translation>아바타 자격 부여</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2027"/> - <location filename="../ProfileInterface.cpp" line="2120"/> - <location filename="../ProfileInterface.cpp" line="2235"/> - <location filename="../ProfileInterface.cpp" line="2330"/> + <location filename="../ProfileInterface.cpp" line="2026"/> + <location filename="../ProfileInterface.cpp" line="2119"/> + <location filename="../ProfileInterface.cpp" line="2234"/> + <location filename="../ProfileInterface.cpp" line="2329"/> <source>Patch selected...</source> <translation>패치가 선택됨...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2028"/> - <location filename="../ProfileInterface.cpp" line="2046"/> - <location filename="../ProfileInterface.cpp" line="2121"/> - <location filename="../ProfileInterface.cpp" line="2139"/> - <location filename="../ProfileInterface.cpp" line="2236"/> - <location filename="../ProfileInterface.cpp" line="2254"/> - <location filename="../ProfileInterface.cpp" line="2331"/> - <location filename="../ProfileInterface.cpp" line="2349"/> + <location filename="../ProfileInterface.cpp" line="2027"/> + <location filename="../ProfileInterface.cpp" line="2045"/> + <location filename="../ProfileInterface.cpp" line="2120"/> + <location filename="../ProfileInterface.cpp" line="2138"/> + <location filename="../ProfileInterface.cpp" line="2235"/> + <location filename="../ProfileInterface.cpp" line="2253"/> + <location filename="../ProfileInterface.cpp" line="2330"/> + <location filename="../ProfileInterface.cpp" line="2348"/> <source>Patch file %1 of %2 files</source> <translation>%2 파일의 %1 패치 파일입니다.</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2076"/> + <location filename="../ProfileInterface.cpp" line="2075"/> <source>Qualify</source> <comment>%1 failed with...</comment> <translatorcomment>%1이(가) 실패한 경우...</translatorcomment> <translation>자격 부여</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2095"/> - <location filename="../ProfileInterface.cpp" line="2165"/> + <location filename="../ProfileInterface.cpp" line="2094"/> + <location filename="../ProfileInterface.cpp" line="2164"/> <source>Change Players...</source> <translation>플레이어 변경</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2165"/> + <location filename="../ProfileInterface.cpp" line="2164"/> <source>Change Players</source> <comment>%1 failed with...</comment> <translatorcomment>%1이(가) 실패한 경우...</translatorcomment> <translation>플레이어 변경</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2184"/> - <location filename="../ProfileInterface.cpp" line="2214"/> - <location filename="../ProfileInterface.cpp" line="2280"/> + <location filename="../ProfileInterface.cpp" line="2183"/> + <location filename="../ProfileInterface.cpp" line="2213"/> + <location filename="../ProfileInterface.cpp" line="2279"/> <source>Change Crew...</source> <translation>조직 변경</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2214"/> + <location filename="../ProfileInterface.cpp" line="2213"/> <source>Failed to enter a valid Snapmatic Crew ID</source> <translation>올바른 스냅매틱 조직 아이디를 입력하지 못했습니다.</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2280"/> + <location filename="../ProfileInterface.cpp" line="2279"/> <source>Change Crew</source> <comment>%1 failed with...</comment> <translatorcomment>%1이(가) 실패한 경우...</translatorcomment> <translation>조직 변경</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2299"/> - <location filename="../ProfileInterface.cpp" line="2313"/> - <location filename="../ProfileInterface.cpp" line="2372"/> + <location filename="../ProfileInterface.cpp" line="2298"/> + <location filename="../ProfileInterface.cpp" line="2312"/> + <location filename="../ProfileInterface.cpp" line="2371"/> <source>Change Title...</source> <translation>제목 변경</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2313"/> + <location filename="../ProfileInterface.cpp" line="2312"/> <source>Failed to enter a valid Snapmatic title</source> <translation>올바른 스냅매틱 제목을 입력하지 않았습니다.</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2372"/> + <location filename="../ProfileInterface.cpp" line="2371"/> <source>Change Title</source> <comment>%1 failed with...</comment> <translatorcomment>%1이(가) 실패한 경우...</translatorcomment> <translation>제목 변경</translation> </message> <message> - <location filename="../UserInterface.cpp" line="586"/> + <location filename="../UserInterface.cpp" line="591"/> <source>All profile files (*.g5e SGTA* PGTA*)</source> <translation>모든 프로필 파일 (*.g5e SGTA* PGTA*)</translation> </message> @@ -2043,25 +2043,25 @@ Press 1 for Default View</source> <translation>JSON 오류로 인해 스냅매틱 속성을 패치하지 못했습니다.</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2208"/> + <location filename="../ProfileInterface.cpp" line="2207"/> <location filename="../SnapmaticEditor.cpp" line="403"/> <source>Snapmatic Crew</source> <translation>조직 스냅매틱</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2208"/> + <location filename="../ProfileInterface.cpp" line="2207"/> <location filename="../SnapmaticEditor.cpp" line="403"/> <source>New Snapmatic crew:</source> <translation>새로운 조직 스냅매틱:</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2310"/> + <location filename="../ProfileInterface.cpp" line="2309"/> <location filename="../SnapmaticEditor.cpp" line="379"/> <source>Snapmatic Title</source> <translation>스냅매틱 제목</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2310"/> + <location filename="../ProfileInterface.cpp" line="2309"/> <location filename="../SnapmaticEditor.cpp" line="379"/> <source>New Snapmatic title:</source> <translation>새로운 스냅매틱 제목:</translation> @@ -2122,19 +2122,19 @@ Press 1 for Default View</source> <name>SnapmaticPicture</name> <message> <location filename="../JsonEditorDialog.cpp" line="165"/> - <location filename="../SnapmaticPicture.cpp" line="344"/> + <location filename="../SnapmaticPicture.cpp" line="345"/> <source>JSON is incomplete and malformed</source> <translation>JSON 파일이 불안정하거나 형식이 잘못되었습니다.</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="168"/> - <location filename="../SnapmaticPicture.cpp" line="347"/> + <location filename="../SnapmaticPicture.cpp" line="348"/> <source>JSON is incomplete</source> <translation>JSON 파일이 불안정합니다.</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="171"/> - <location filename="../SnapmaticPicture.cpp" line="350"/> + <location filename="../SnapmaticPicture.cpp" line="351"/> <source>JSON is malformed</source> <translation>잘못된 JSON 형식</translation> </message> @@ -2144,42 +2144,42 @@ Press 1 for Default View</source> <translation>사진 - %1</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="314"/> + <location filename="../SnapmaticPicture.cpp" line="315"/> <source>open file %1</source> <translation>파일 열기 %1</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="326"/> + <location filename="../SnapmaticPicture.cpp" line="327"/> <source>header not exists</source> <translation>헤더가 존재하지 않습니다.</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="329"/> + <location filename="../SnapmaticPicture.cpp" line="330"/> <source>header is malformed</source> <translation>헤더의 형식이 잘못되었습니다.</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="332"/> + <location filename="../SnapmaticPicture.cpp" line="333"/> <source>picture not exists (%1)</source> <translation>이미지가 존재하지 않습니다. (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="335"/> + <location filename="../SnapmaticPicture.cpp" line="336"/> <source>JSON not exists (%1)</source> <translation>JSON 파일이 존재하지 않습니다. (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="338"/> + <location filename="../SnapmaticPicture.cpp" line="339"/> <source>title not exists (%1)</source> <translation>제목이 존재하지 않습니다. (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="341"/> + <location filename="../SnapmaticPicture.cpp" line="342"/> <source>description not exists (%1)</source> <translation>설명이 존재하지 않습니다. (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="352"/> + <location filename="../SnapmaticPicture.cpp" line="353"/> <source>reading file %1 because of %2</source> <comment>Example for %2: JSON is malformed error</comment> <translatorcomment>%2의 예: JSON이 잘못된 형식입니다</translatorcomment> @@ -2348,7 +2348,7 @@ Press 1 for Default View</source> <name>UserInterface</name> <message> <location filename="../UserInterface.ui" line="20"/> - <location filename="../UserInterface.cpp" line="78"/> + <location filename="../UserInterface.cpp" line="83"/> <source>%2 - %1</source> <translation>%2 - %1</translation> </message> @@ -2381,9 +2381,9 @@ Press 1 for Default View</source> </message> <message> <location filename="../UserInterface.ui" line="153"/> - <location filename="../UserInterface.cpp" line="264"/> - <location filename="../UserInterface.cpp" line="288"/> - <location filename="../UserInterface.cpp" line="786"/> + <location filename="../UserInterface.cpp" line="269"/> + <location filename="../UserInterface.cpp" line="293"/> + <location filename="../UserInterface.cpp" line="791"/> <source>&Close</source> <translation>닫기(&C)</translation> </message> @@ -2419,8 +2419,8 @@ Press 1 for Default View</source> </message> <message> <location filename="../UserInterface.ui" line="236"/> - <location filename="../UserInterface.cpp" line="76"/> - <location filename="../UserInterface.cpp" line="876"/> + <location filename="../UserInterface.cpp" line="80"/> + <location filename="../UserInterface.cpp" line="885"/> <source>&About %1</source> <translation>%1 정보(&A)</translation> </message> @@ -2476,15 +2476,15 @@ Press 1 for Default View</source> </message> <message> <location filename="../UserInterface.ui" line="319"/> - <location filename="../UserInterface.cpp" line="382"/> + <location filename="../UserInterface.cpp" line="387"/> <source>Select &GTA V Folder...</source> <translation>GTA V 폴더 선택(&G)</translation> </message> <message> <location filename="../UserInterface.ui" line="322"/> <location filename="../OptionsDialog.cpp" line="704"/> - <location filename="../UserInterface.cpp" line="329"/> - <location filename="../UserInterface.cpp" line="844"/> + <location filename="../UserInterface.cpp" line="334"/> + <location filename="../UserInterface.cpp" line="849"/> <source>Select GTA V Folder...</source> <translation>GTA V 폴더 선택</translation> </message> @@ -2541,25 +2541,25 @@ Press 1 for Default View</source> <translation>인게임 숨기기</translation> </message> <message> - <location filename="../UserInterface.cpp" line="80"/> - <location filename="../UserInterface.cpp" line="445"/> - <location filename="../UserInterface.cpp" line="889"/> + <location filename="../UserInterface.cpp" line="85"/> + <location filename="../UserInterface.cpp" line="450"/> + <location filename="../UserInterface.cpp" line="898"/> <source>Select Profile</source> <translation>프로필 선택</translation> </message> <message> - <location filename="../UserInterface.cpp" line="168"/> - <location filename="../UserInterface.cpp" line="873"/> + <location filename="../UserInterface.cpp" line="173"/> + <location filename="../UserInterface.cpp" line="878"/> <source>&Donate</source> <translation>기부하기(&D)</translation> </message> <message> - <location filename="../UserInterface.cpp" line="181"/> + <location filename="../UserInterface.cpp" line="186"/> <source>Donate</source> <translation>기부하기</translation> </message> <message> - <location filename="../UserInterface.cpp" line="189"/> + <location filename="../UserInterface.cpp" line="194"/> <source>Donation methods</source> <translation>기부 방법</translation> </message> @@ -2572,30 +2572,30 @@ Press 1 for Default View</source> <translation type="vanished">복사</translation> </message> <message> - <location filename="../UserInterface.cpp" line="256"/> + <location filename="../UserInterface.cpp" line="261"/> <source>&Copy</source> <translation>복사(&C)</translation> </message> <message> - <location filename="../UserInterface.cpp" line="583"/> + <location filename="../UserInterface.cpp" line="588"/> <source>Open File...</source> <translation>파일 열기...</translation> </message> <message> - <location filename="../UserInterface.cpp" line="625"/> - <location filename="../UserInterface.cpp" line="639"/> - <location filename="../UserInterface.cpp" line="663"/> - <location filename="../UserInterface.cpp" line="669"/> + <location filename="../UserInterface.cpp" line="630"/> + <location filename="../UserInterface.cpp" line="644"/> + <location filename="../UserInterface.cpp" line="668"/> + <location filename="../UserInterface.cpp" line="674"/> <source>Open File</source> <translation>파일 열기</translation> </message> <message> - <location filename="../UserInterface.cpp" line="663"/> + <location filename="../UserInterface.cpp" line="668"/> <source>Can't open %1 because of not valid file format</source> <translation>올바른 파일 형식이 아니므로 %1을 열 수 없습니다.</translation> </message> <message> - <location filename="../UserInterface.cpp" line="751"/> + <location filename="../UserInterface.cpp" line="756"/> <source>%1 - Messages</source> <translation>%1 - 뉴스</translation> </message> diff --git a/res/gta5sync_ru.ts b/res/gta5sync_ru.ts index 914cb87..a05570c 100644 --- a/res/gta5sync_ru.ts +++ b/res/gta5sync_ru.ts @@ -1395,13 +1395,13 @@ Press 1 for Default View</source> </message> <message> <location filename="../ProfileInterface.cpp" line="560"/> - <location filename="../UserInterface.cpp" line="588"/> + <location filename="../UserInterface.cpp" line="593"/> <source>Savegames files (SGTA*)</source> <translation>Файлы сохранения (SGTA*)</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="561"/> - <location filename="../UserInterface.cpp" line="589"/> + <location filename="../UserInterface.cpp" line="594"/> <source>Snapmatic pictures (PGTA*)</source> <translation>Картинка Snapmatic (PGTA*)</translation> </message> @@ -1409,7 +1409,7 @@ Press 1 for Default View</source> <location filename="../ImportDialog.cpp" line="534"/> <location filename="../ImportDialog.cpp" line="844"/> <location filename="../ProfileInterface.cpp" line="563"/> - <location filename="../UserInterface.cpp" line="590"/> + <location filename="../UserInterface.cpp" line="595"/> <source>All files (**)</source> <translation>Все файлы (**)</translation> </message> @@ -1430,20 +1430,20 @@ Press 1 for Default View</source> </message> <message> <location filename="../ProfileInterface.cpp" line="676"/> - <location filename="../UserInterface.cpp" line="625"/> + <location filename="../UserInterface.cpp" line="630"/> <source>Failed to read Snapmatic picture</source> <translation>Не удалось загрузить картинку Snapmatic</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="711"/> - <location filename="../UserInterface.cpp" line="639"/> + <location filename="../UserInterface.cpp" line="644"/> <source>Failed to read Savegame file</source> <translation>Не удалось загрузить файл сохранения</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="583"/> <location filename="../ProfileInterface.cpp" line="974"/> - <location filename="../UserInterface.cpp" line="669"/> + <location filename="../UserInterface.cpp" line="674"/> <source>No valid file is selected</source> <translation>Выбранный файл неверен</translation> </message> @@ -1550,48 +1550,48 @@ Press 1 for Default View</source> <translation>Подготовка данных к импорту...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2016"/> - <location filename="../ProfileInterface.cpp" line="2076"/> + <location filename="../ProfileInterface.cpp" line="2015"/> + <location filename="../ProfileInterface.cpp" line="2075"/> <source>Qualify as Avatar</source> <translation>Пометить как Аватар</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="1583"/> <location filename="../ProfileInterface.cpp" line="1613"/> - <location filename="../ProfileInterface.cpp" line="2016"/> - <location filename="../ProfileInterface.cpp" line="2095"/> - <location filename="../ProfileInterface.cpp" line="2184"/> - <location filename="../ProfileInterface.cpp" line="2299"/> + <location filename="../ProfileInterface.cpp" line="2015"/> + <location filename="../ProfileInterface.cpp" line="2094"/> + <location filename="../ProfileInterface.cpp" line="2183"/> + <location filename="../ProfileInterface.cpp" line="2298"/> <source>No Snapmatic pictures are selected</source> <translation>Не выделена ни одна картинка Snapmatic</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2027"/> - <location filename="../ProfileInterface.cpp" line="2120"/> - <location filename="../ProfileInterface.cpp" line="2235"/> - <location filename="../ProfileInterface.cpp" line="2330"/> + <location filename="../ProfileInterface.cpp" line="2026"/> + <location filename="../ProfileInterface.cpp" line="2119"/> + <location filename="../ProfileInterface.cpp" line="2234"/> + <location filename="../ProfileInterface.cpp" line="2329"/> <source>Patch selected...</source> <translation>Пропатчить выделенные...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2028"/> - <location filename="../ProfileInterface.cpp" line="2046"/> - <location filename="../ProfileInterface.cpp" line="2121"/> - <location filename="../ProfileInterface.cpp" line="2139"/> - <location filename="../ProfileInterface.cpp" line="2236"/> - <location filename="../ProfileInterface.cpp" line="2254"/> - <location filename="../ProfileInterface.cpp" line="2331"/> - <location filename="../ProfileInterface.cpp" line="2349"/> + <location filename="../ProfileInterface.cpp" line="2027"/> + <location filename="../ProfileInterface.cpp" line="2045"/> + <location filename="../ProfileInterface.cpp" line="2120"/> + <location filename="../ProfileInterface.cpp" line="2138"/> + <location filename="../ProfileInterface.cpp" line="2235"/> + <location filename="../ProfileInterface.cpp" line="2253"/> + <location filename="../ProfileInterface.cpp" line="2330"/> + <location filename="../ProfileInterface.cpp" line="2348"/> <source>Patch file %1 of %2 files</source> <translation>Изменяется файл %1 из %2</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="1594"/> <location filename="../ProfileInterface.cpp" line="1624"/> - <location filename="../ProfileInterface.cpp" line="2076"/> - <location filename="../ProfileInterface.cpp" line="2165"/> - <location filename="../ProfileInterface.cpp" line="2280"/> - <location filename="../ProfileInterface.cpp" line="2372"/> + <location filename="../ProfileInterface.cpp" line="2075"/> + <location filename="../ProfileInterface.cpp" line="2164"/> + <location filename="../ProfileInterface.cpp" line="2279"/> + <location filename="../ProfileInterface.cpp" line="2371"/> <source>%1 failed with... %2</source> @@ -1612,55 +1612,55 @@ Press 1 for Default View</source> <translation>Не удалось удалить все выделенные картинки Snapmatic и/или сохранения</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2076"/> + <location filename="../ProfileInterface.cpp" line="2075"/> <source>Qualify</source> <comment>%1 failed with...</comment> <translation>Помечание</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2095"/> - <location filename="../ProfileInterface.cpp" line="2165"/> + <location filename="../ProfileInterface.cpp" line="2094"/> + <location filename="../ProfileInterface.cpp" line="2164"/> <source>Change Players...</source> <translation>Изменить игроков...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2165"/> + <location filename="../ProfileInterface.cpp" line="2164"/> <source>Change Players</source> <comment>%1 failed with...</comment> <translation>Измение игроков</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2184"/> - <location filename="../ProfileInterface.cpp" line="2214"/> - <location filename="../ProfileInterface.cpp" line="2280"/> + <location filename="../ProfileInterface.cpp" line="2183"/> + <location filename="../ProfileInterface.cpp" line="2213"/> + <location filename="../ProfileInterface.cpp" line="2279"/> <source>Change Crew...</source> <translation>Изменить банду...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2214"/> + <location filename="../ProfileInterface.cpp" line="2213"/> <source>Failed to enter a valid Snapmatic Crew ID</source> <translation>Введённый идентификатор банды не верен</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2280"/> + <location filename="../ProfileInterface.cpp" line="2279"/> <source>Change Crew</source> <comment>%1 failed with...</comment> <translation>Изменение банды</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2299"/> - <location filename="../ProfileInterface.cpp" line="2313"/> - <location filename="../ProfileInterface.cpp" line="2372"/> + <location filename="../ProfileInterface.cpp" line="2298"/> + <location filename="../ProfileInterface.cpp" line="2312"/> + <location filename="../ProfileInterface.cpp" line="2371"/> <source>Change Title...</source> <translation>Изменить заголовок...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2313"/> + <location filename="../ProfileInterface.cpp" line="2312"/> <source>Failed to enter a valid Snapmatic title</source> <translation>Введённый заголовок не верен</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2372"/> + <location filename="../ProfileInterface.cpp" line="2371"/> <source>Change Title</source> <comment>%1 failed with...</comment> <translation>Изменение заголовка</translation> @@ -1696,13 +1696,13 @@ Press 1 for Default View</source> <translation>Экспортируется файл %1 из %2</translation> </message> <message> - <location filename="../UserInterface.cpp" line="586"/> + <location filename="../UserInterface.cpp" line="591"/> <source>All profile files (*.g5e SGTA* PGTA*)</source> <translation>Все файлы профиля (*.g5e SGTA* PGTA*)</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="559"/> - <location filename="../UserInterface.cpp" line="587"/> + <location filename="../UserInterface.cpp" line="592"/> <source>GTA V Export (*.g5e)</source> <translation>GTA V Export (*.g5e)</translation> </message> @@ -1977,7 +1977,7 @@ Press 1 for Default View</source> <translation>Meme</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2310"/> + <location filename="../ProfileInterface.cpp" line="2309"/> <location filename="../SnapmaticEditor.cpp" line="379"/> <source>Snapmatic Title</source> <translation>Заголовок Snapmatic</translation> @@ -2083,19 +2083,19 @@ Press 1 for Default View</source> <translation>Не удалось измененить свойства Snapmatic из-за проблемы ввода/вывода</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2310"/> + <location filename="../ProfileInterface.cpp" line="2309"/> <location filename="../SnapmaticEditor.cpp" line="379"/> <source>New Snapmatic title:</source> <translation>Новый заголовок Snapmatic:</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2208"/> + <location filename="../ProfileInterface.cpp" line="2207"/> <location filename="../SnapmaticEditor.cpp" line="403"/> <source>Snapmatic Crew</source> <translation>Банда на Snapmatic</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2208"/> + <location filename="../ProfileInterface.cpp" line="2207"/> <location filename="../SnapmaticEditor.cpp" line="403"/> <source>New Snapmatic crew:</source> <translation>Новая банда на Snapmatic:</translation> @@ -2109,61 +2109,61 @@ Press 1 for Default View</source> <translation>ФОТО - %1</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="314"/> + <location filename="../SnapmaticPicture.cpp" line="315"/> <source>open file %1</source> <translation>Открыть файл %1</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="326"/> + <location filename="../SnapmaticPicture.cpp" line="327"/> <source>header not exists</source> <translation>Отсутствует шапка (header)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="329"/> + <location filename="../SnapmaticPicture.cpp" line="330"/> <source>header is malformed</source> <translation>Шапка (header) повреждена</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="332"/> + <location filename="../SnapmaticPicture.cpp" line="333"/> <source>picture not exists (%1)</source> <translation>Картинки не существует (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="335"/> + <location filename="../SnapmaticPicture.cpp" line="336"/> <source>JSON not exists (%1)</source> <translation>JSON не существует (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="338"/> + <location filename="../SnapmaticPicture.cpp" line="339"/> <source>title not exists (%1)</source> <translation>Заголовок отсутствует (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="341"/> + <location filename="../SnapmaticPicture.cpp" line="342"/> <source>description not exists (%1)</source> <translation>Описание отсутствует (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="352"/> + <location filename="../SnapmaticPicture.cpp" line="353"/> <source>reading file %1 because of %2</source> <comment>Example for %2: JSON is malformed error</comment> <translation>Чтение из файла %1 из-за %2</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="165"/> - <location filename="../SnapmaticPicture.cpp" line="344"/> + <location filename="../SnapmaticPicture.cpp" line="345"/> <source>JSON is incomplete and malformed</source> <translation>JSON не полный и повреждён</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="168"/> - <location filename="../SnapmaticPicture.cpp" line="347"/> + <location filename="../SnapmaticPicture.cpp" line="348"/> <source>JSON is incomplete</source> <translation>JSON частично отсутствует</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="171"/> - <location filename="../SnapmaticPicture.cpp" line="350"/> + <location filename="../SnapmaticPicture.cpp" line="351"/> <source>JSON is malformed</source> <translation>JSON повреждён</translation> </message> @@ -2396,7 +2396,7 @@ Press 1 for Default View</source> </message> <message> <location filename="../UserInterface.ui" line="319"/> - <location filename="../UserInterface.cpp" line="382"/> + <location filename="../UserInterface.cpp" line="387"/> <source>Select &GTA V Folder...</source> <translation>Выбрать &папку GTA V...</translation> </message> @@ -2440,9 +2440,9 @@ Press 1 for Default View</source> </message> <message> <location filename="../UserInterface.ui" line="153"/> - <location filename="../UserInterface.cpp" line="264"/> - <location filename="../UserInterface.cpp" line="288"/> - <location filename="../UserInterface.cpp" line="786"/> + <location filename="../UserInterface.cpp" line="269"/> + <location filename="../UserInterface.cpp" line="293"/> + <location filename="../UserInterface.cpp" line="791"/> <source>&Close</source> <translation>&Закрыть</translation> </message> @@ -2482,51 +2482,51 @@ Press 1 for Default View</source> <translation>&Открыть файл...</translation> </message> <message> - <location filename="../UserInterface.cpp" line="80"/> - <location filename="../UserInterface.cpp" line="445"/> - <location filename="../UserInterface.cpp" line="889"/> + <location filename="../UserInterface.cpp" line="85"/> + <location filename="../UserInterface.cpp" line="450"/> + <location filename="../UserInterface.cpp" line="898"/> <source>Select Profile</source> <translation>Выбор профиля</translation> </message> <message> <location filename="../UserInterface.ui" line="322"/> <location filename="../OptionsDialog.cpp" line="704"/> - <location filename="../UserInterface.cpp" line="329"/> - <location filename="../UserInterface.cpp" line="844"/> + <location filename="../UserInterface.cpp" line="334"/> + <location filename="../UserInterface.cpp" line="849"/> <source>Select GTA V Folder...</source> <translation>Выбрать папку GTA V...</translation> </message> <message> <location filename="../UserInterface.ui" line="20"/> - <location filename="../UserInterface.cpp" line="78"/> + <location filename="../UserInterface.cpp" line="83"/> <source>%2 - %1</source> <translation>%2 - %1</translation> </message> <message> <location filename="../UserInterface.ui" line="236"/> - <location filename="../UserInterface.cpp" line="76"/> - <location filename="../UserInterface.cpp" line="876"/> + <location filename="../UserInterface.cpp" line="80"/> + <location filename="../UserInterface.cpp" line="885"/> <source>&About %1</source> <translation>&О программе %1</translation> </message> <message> - <location filename="../UserInterface.cpp" line="168"/> - <location filename="../UserInterface.cpp" line="873"/> + <location filename="../UserInterface.cpp" line="173"/> + <location filename="../UserInterface.cpp" line="878"/> <source>&Donate</source> <translation>По&жертвовать</translation> </message> <message> - <location filename="../UserInterface.cpp" line="181"/> + <location filename="../UserInterface.cpp" line="186"/> <source>Donate</source> <translation>Пожертвовать</translation> </message> <message> - <location filename="../UserInterface.cpp" line="189"/> + <location filename="../UserInterface.cpp" line="194"/> <source>Donation methods</source> <translation>Способы для взноса</translation> </message> <message> - <location filename="../UserInterface.cpp" line="256"/> + <location filename="../UserInterface.cpp" line="261"/> <source>&Copy</source> <translation>&Копировать</translation> </message> @@ -2539,25 +2539,25 @@ Press 1 for Default View</source> <translation type="vanished">Копировать</translation> </message> <message> - <location filename="../UserInterface.cpp" line="583"/> + <location filename="../UserInterface.cpp" line="588"/> <source>Open File...</source> <translation>Открыть файл...</translation> </message> <message> - <location filename="../UserInterface.cpp" line="625"/> - <location filename="../UserInterface.cpp" line="639"/> - <location filename="../UserInterface.cpp" line="663"/> - <location filename="../UserInterface.cpp" line="669"/> + <location filename="../UserInterface.cpp" line="630"/> + <location filename="../UserInterface.cpp" line="644"/> + <location filename="../UserInterface.cpp" line="668"/> + <location filename="../UserInterface.cpp" line="674"/> <source>Open File</source> <translation>Открыть файл</translation> </message> <message> - <location filename="../UserInterface.cpp" line="663"/> + <location filename="../UserInterface.cpp" line="668"/> <source>Can't open %1 because of not valid file format</source> <translation>Не удалось открыть %1 из-за неверного формата файла</translation> </message> <message> - <location filename="../UserInterface.cpp" line="751"/> + <location filename="../UserInterface.cpp" line="756"/> <source>%1 - Messages</source> <translation>%1 - Новости</translation> </message> diff --git a/res/gta5sync_uk.ts b/res/gta5sync_uk.ts index 4d08720..c49c9ce 100644 --- a/res/gta5sync_uk.ts +++ b/res/gta5sync_uk.ts @@ -1387,7 +1387,7 @@ Press 1 for Default View</source> <location filename="../ImportDialog.cpp" line="534"/> <location filename="../ImportDialog.cpp" line="844"/> <location filename="../ProfileInterface.cpp" line="563"/> - <location filename="../UserInterface.cpp" line="590"/> + <location filename="../UserInterface.cpp" line="595"/> <source>All files (**)</source> <translation>Усі файли (**)</translation> </message> @@ -1432,26 +1432,26 @@ Press 1 for Default View</source> </message> <message> <location filename="../ProfileInterface.cpp" line="559"/> - <location filename="../UserInterface.cpp" line="587"/> + <location filename="../UserInterface.cpp" line="592"/> <source>GTA V Export (*.g5e)</source> <translation>GTA V Export (*.g5e)</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="560"/> - <location filename="../UserInterface.cpp" line="588"/> + <location filename="../UserInterface.cpp" line="593"/> <source>Savegames files (SGTA*)</source> <translation>Файли збереження гри (SGTA*)</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="561"/> - <location filename="../UserInterface.cpp" line="589"/> + <location filename="../UserInterface.cpp" line="594"/> <source>Snapmatic pictures (PGTA*)</source> <translation>Snapmatic зображення (PGTA*)</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="583"/> <location filename="../ProfileInterface.cpp" line="974"/> - <location filename="../UserInterface.cpp" line="669"/> + <location filename="../UserInterface.cpp" line="674"/> <source>No valid file is selected</source> <translation>Вибрані недійсні файли</translation> </message> @@ -1472,13 +1472,13 @@ Press 1 for Default View</source> </message> <message> <location filename="../ProfileInterface.cpp" line="676"/> - <location filename="../UserInterface.cpp" line="625"/> + <location filename="../UserInterface.cpp" line="630"/> <source>Failed to read Snapmatic picture</source> <translation>Не вдалося прочитати Snapmatic картинку</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="711"/> - <location filename="../UserInterface.cpp" line="639"/> + <location filename="../UserInterface.cpp" line="644"/> <source>Failed to read Savegame file</source> <translation>Не вдалося прочитати файл збереження гри</translation> </message> @@ -1579,20 +1579,20 @@ Press 1 for Default View</source> <message> <location filename="../ProfileInterface.cpp" line="1583"/> <location filename="../ProfileInterface.cpp" line="1613"/> - <location filename="../ProfileInterface.cpp" line="2016"/> - <location filename="../ProfileInterface.cpp" line="2095"/> - <location filename="../ProfileInterface.cpp" line="2184"/> - <location filename="../ProfileInterface.cpp" line="2299"/> + <location filename="../ProfileInterface.cpp" line="2015"/> + <location filename="../ProfileInterface.cpp" line="2094"/> + <location filename="../ProfileInterface.cpp" line="2183"/> + <location filename="../ProfileInterface.cpp" line="2298"/> <source>No Snapmatic pictures are selected</source> <translation>Не вибрано жодного Snapmatic зображення</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="1594"/> <location filename="../ProfileInterface.cpp" line="1624"/> - <location filename="../ProfileInterface.cpp" line="2076"/> - <location filename="../ProfileInterface.cpp" line="2165"/> - <location filename="../ProfileInterface.cpp" line="2280"/> - <location filename="../ProfileInterface.cpp" line="2372"/> + <location filename="../ProfileInterface.cpp" line="2075"/> + <location filename="../ProfileInterface.cpp" line="2164"/> + <location filename="../ProfileInterface.cpp" line="2279"/> + <location filename="../ProfileInterface.cpp" line="2371"/> <source>%1 failed with... %2</source> @@ -1612,87 +1612,87 @@ Press 1 for Default View</source> <translation>Snapmatic зображення з uid %1 вже існує, ви хочете призначити для імпорту новий uid та мітку часу?</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2016"/> - <location filename="../ProfileInterface.cpp" line="2076"/> + <location filename="../ProfileInterface.cpp" line="2015"/> + <location filename="../ProfileInterface.cpp" line="2075"/> <source>Qualify as Avatar</source> <translation>Позначити як Аватар</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2027"/> - <location filename="../ProfileInterface.cpp" line="2120"/> - <location filename="../ProfileInterface.cpp" line="2235"/> - <location filename="../ProfileInterface.cpp" line="2330"/> + <location filename="../ProfileInterface.cpp" line="2026"/> + <location filename="../ProfileInterface.cpp" line="2119"/> + <location filename="../ProfileInterface.cpp" line="2234"/> + <location filename="../ProfileInterface.cpp" line="2329"/> <source>Patch selected...</source> <translation>Вибір патчу...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2028"/> - <location filename="../ProfileInterface.cpp" line="2046"/> - <location filename="../ProfileInterface.cpp" line="2121"/> - <location filename="../ProfileInterface.cpp" line="2139"/> - <location filename="../ProfileInterface.cpp" line="2236"/> - <location filename="../ProfileInterface.cpp" line="2254"/> - <location filename="../ProfileInterface.cpp" line="2331"/> - <location filename="../ProfileInterface.cpp" line="2349"/> + <location filename="../ProfileInterface.cpp" line="2027"/> + <location filename="../ProfileInterface.cpp" line="2045"/> + <location filename="../ProfileInterface.cpp" line="2120"/> + <location filename="../ProfileInterface.cpp" line="2138"/> + <location filename="../ProfileInterface.cpp" line="2235"/> + <location filename="../ProfileInterface.cpp" line="2253"/> + <location filename="../ProfileInterface.cpp" line="2330"/> + <location filename="../ProfileInterface.cpp" line="2348"/> <source>Patch file %1 of %2 files</source> <translation>Патч файлу %1 з %2 файлів</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2076"/> + <location filename="../ProfileInterface.cpp" line="2075"/> <source>Qualify</source> <comment>%1 failed with...</comment> <translation>Якість</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2095"/> - <location filename="../ProfileInterface.cpp" line="2165"/> + <location filename="../ProfileInterface.cpp" line="2094"/> + <location filename="../ProfileInterface.cpp" line="2164"/> <source>Change Players...</source> <translation>Зміна гравців...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2165"/> + <location filename="../ProfileInterface.cpp" line="2164"/> <source>Change Players</source> <comment>%1 failed with...</comment> <translation>Змінити гравців</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2184"/> - <location filename="../ProfileInterface.cpp" line="2214"/> - <location filename="../ProfileInterface.cpp" line="2280"/> + <location filename="../ProfileInterface.cpp" line="2183"/> + <location filename="../ProfileInterface.cpp" line="2213"/> + <location filename="../ProfileInterface.cpp" line="2279"/> <source>Change Crew...</source> <translation>Зміна банди...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2214"/> + <location filename="../ProfileInterface.cpp" line="2213"/> <source>Failed to enter a valid Snapmatic Crew ID</source> <translation>Не вдалося ввести дійсний ID Банди Snapmatic</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2280"/> + <location filename="../ProfileInterface.cpp" line="2279"/> <source>Change Crew</source> <comment>%1 failed with...</comment> <translation>Змінити банду</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2299"/> - <location filename="../ProfileInterface.cpp" line="2313"/> - <location filename="../ProfileInterface.cpp" line="2372"/> + <location filename="../ProfileInterface.cpp" line="2298"/> + <location filename="../ProfileInterface.cpp" line="2312"/> + <location filename="../ProfileInterface.cpp" line="2371"/> <source>Change Title...</source> <translation>Зміна назви...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2313"/> + <location filename="../ProfileInterface.cpp" line="2312"/> <source>Failed to enter a valid Snapmatic title</source> <translation>Не вдалося ввести дійсний заголовок Snapmatic</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2372"/> + <location filename="../ProfileInterface.cpp" line="2371"/> <source>Change Title</source> <comment>%1 failed with...</comment> <translation>Змінити назву</translation> </message> <message> - <location filename="../UserInterface.cpp" line="586"/> + <location filename="../UserInterface.cpp" line="591"/> <source>All profile files (*.g5e SGTA* PGTA*)</source> <translation>Усі файли зображень (*.g5e SGTA* PGTA*)</translation> </message> @@ -2028,25 +2028,25 @@ Press 1 for Default View</source> <translation>Змінити властивості Snapmatic не вдалося через JSON Помилку</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2208"/> + <location filename="../ProfileInterface.cpp" line="2207"/> <location filename="../SnapmaticEditor.cpp" line="403"/> <source>Snapmatic Crew</source> <translation>Snapmatic банда</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2208"/> + <location filename="../ProfileInterface.cpp" line="2207"/> <location filename="../SnapmaticEditor.cpp" line="403"/> <source>New Snapmatic crew:</source> <translation>Нова Snapmatic банда:</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2310"/> + <location filename="../ProfileInterface.cpp" line="2309"/> <location filename="../SnapmaticEditor.cpp" line="379"/> <source>Snapmatic Title</source> <translation>Snapmatic назва</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2310"/> + <location filename="../ProfileInterface.cpp" line="2309"/> <location filename="../SnapmaticEditor.cpp" line="379"/> <source>New Snapmatic title:</source> <translation>Новий Snapmatic заголовок:</translation> @@ -2103,19 +2103,19 @@ Press 1 for Default View</source> <name>SnapmaticPicture</name> <message> <location filename="../JsonEditorDialog.cpp" line="165"/> - <location filename="../SnapmaticPicture.cpp" line="344"/> + <location filename="../SnapmaticPicture.cpp" line="345"/> <source>JSON is incomplete and malformed</source> <translation>JSON неповний та неправильний</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="168"/> - <location filename="../SnapmaticPicture.cpp" line="347"/> + <location filename="../SnapmaticPicture.cpp" line="348"/> <source>JSON is incomplete</source> <translation>JSON неповний</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="171"/> - <location filename="../SnapmaticPicture.cpp" line="350"/> + <location filename="../SnapmaticPicture.cpp" line="351"/> <source>JSON is malformed</source> <translation>JSON неправильний</translation> </message> @@ -2125,42 +2125,42 @@ Press 1 for Default View</source> <translation>ФОТО - %1</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="314"/> + <location filename="../SnapmaticPicture.cpp" line="315"/> <source>open file %1</source> <translation>відкрити файл%1</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="326"/> + <location filename="../SnapmaticPicture.cpp" line="327"/> <source>header not exists</source> <translation>заголовок не існує</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="329"/> + <location filename="../SnapmaticPicture.cpp" line="330"/> <source>header is malformed</source> <translation>заголовок неправильний</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="332"/> + <location filename="../SnapmaticPicture.cpp" line="333"/> <source>picture not exists (%1)</source> <translation>зображення не існує (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="335"/> + <location filename="../SnapmaticPicture.cpp" line="336"/> <source>JSON not exists (%1)</source> <translation>JSON не існує (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="338"/> + <location filename="../SnapmaticPicture.cpp" line="339"/> <source>title not exists (%1)</source> <translation>заголовок не існує (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="341"/> + <location filename="../SnapmaticPicture.cpp" line="342"/> <source>description not exists (%1)</source> <translation>опис не існує (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="352"/> + <location filename="../SnapmaticPicture.cpp" line="353"/> <source>reading file %1 because of %2</source> <comment>Example for %2: JSON is malformed error</comment> <translation>читання файлу %1 тому що %2</translation> @@ -2329,7 +2329,7 @@ Press 1 for Default View</source> <name>UserInterface</name> <message> <location filename="../UserInterface.ui" line="20"/> - <location filename="../UserInterface.cpp" line="78"/> + <location filename="../UserInterface.cpp" line="83"/> <source>%2 - %1</source> <translation>%2 - %1</translation> </message> @@ -2361,9 +2361,9 @@ Press 1 for Default View</source> </message> <message> <location filename="../UserInterface.ui" line="153"/> - <location filename="../UserInterface.cpp" line="264"/> - <location filename="../UserInterface.cpp" line="288"/> - <location filename="../UserInterface.cpp" line="786"/> + <location filename="../UserInterface.cpp" line="269"/> + <location filename="../UserInterface.cpp" line="293"/> + <location filename="../UserInterface.cpp" line="791"/> <source>&Close</source> <translation>&Закрити</translation> </message> @@ -2399,8 +2399,8 @@ Press 1 for Default View</source> </message> <message> <location filename="../UserInterface.ui" line="236"/> - <location filename="../UserInterface.cpp" line="76"/> - <location filename="../UserInterface.cpp" line="876"/> + <location filename="../UserInterface.cpp" line="80"/> + <location filename="../UserInterface.cpp" line="885"/> <source>&About %1</source> <translation>&Про %1</translation> </message> @@ -2456,15 +2456,15 @@ Press 1 for Default View</source> </message> <message> <location filename="../UserInterface.ui" line="319"/> - <location filename="../UserInterface.cpp" line="382"/> + <location filename="../UserInterface.cpp" line="387"/> <source>Select &GTA V Folder...</source> <translation>Вибрати &GTA V теку...</translation> </message> <message> <location filename="../UserInterface.ui" line="322"/> <location filename="../OptionsDialog.cpp" line="704"/> - <location filename="../UserInterface.cpp" line="329"/> - <location filename="../UserInterface.cpp" line="844"/> + <location filename="../UserInterface.cpp" line="334"/> + <location filename="../UserInterface.cpp" line="849"/> <source>Select GTA V Folder...</source> <translation>Вибрати GTA V теку...</translation> </message> @@ -2521,25 +2521,25 @@ Press 1 for Default View</source> <translation>Сховати у грі</translation> </message> <message> - <location filename="../UserInterface.cpp" line="80"/> - <location filename="../UserInterface.cpp" line="445"/> - <location filename="../UserInterface.cpp" line="889"/> + <location filename="../UserInterface.cpp" line="85"/> + <location filename="../UserInterface.cpp" line="450"/> + <location filename="../UserInterface.cpp" line="898"/> <source>Select Profile</source> <translation>Вибрати профіль</translation> </message> <message> - <location filename="../UserInterface.cpp" line="168"/> - <location filename="../UserInterface.cpp" line="873"/> + <location filename="../UserInterface.cpp" line="173"/> + <location filename="../UserInterface.cpp" line="878"/> <source>&Donate</source> <translation>&Пожертвування</translation> </message> <message> - <location filename="../UserInterface.cpp" line="181"/> + <location filename="../UserInterface.cpp" line="186"/> <source>Donate</source> <translation>Пожертвування</translation> </message> <message> - <location filename="../UserInterface.cpp" line="189"/> + <location filename="../UserInterface.cpp" line="194"/> <source>Donation methods</source> <translation>Метод пожертвування</translation> </message> @@ -2552,30 +2552,30 @@ Press 1 for Default View</source> <translation type="vanished">Копіювати</translation> </message> <message> - <location filename="../UserInterface.cpp" line="256"/> + <location filename="../UserInterface.cpp" line="261"/> <source>&Copy</source> <translation>&Копіювати</translation> </message> <message> - <location filename="../UserInterface.cpp" line="583"/> + <location filename="../UserInterface.cpp" line="588"/> <source>Open File...</source> <translation>Відкрити файл...</translation> </message> <message> - <location filename="../UserInterface.cpp" line="625"/> - <location filename="../UserInterface.cpp" line="639"/> - <location filename="../UserInterface.cpp" line="663"/> - <location filename="../UserInterface.cpp" line="669"/> + <location filename="../UserInterface.cpp" line="630"/> + <location filename="../UserInterface.cpp" line="644"/> + <location filename="../UserInterface.cpp" line="668"/> + <location filename="../UserInterface.cpp" line="674"/> <source>Open File</source> <translation>Відкрити файл</translation> </message> <message> - <location filename="../UserInterface.cpp" line="663"/> + <location filename="../UserInterface.cpp" line="668"/> <source>Can't open %1 because of not valid file format</source> <translation>Неможливо відкрити %1 через невідомий формат файлу</translation> </message> <message> - <location filename="../UserInterface.cpp" line="751"/> + <location filename="../UserInterface.cpp" line="756"/> <source>%1 - Messages</source> <translation>%1 - Новини</translation> </message> diff --git a/res/gta5sync_zh_TW.ts b/res/gta5sync_zh_TW.ts index bb70143..fb4d4bc 100644 --- a/res/gta5sync_zh_TW.ts +++ b/res/gta5sync_zh_TW.ts @@ -1381,7 +1381,7 @@ Press 1 for Default View</source> <location filename="../ImportDialog.cpp" line="534"/> <location filename="../ImportDialog.cpp" line="844"/> <location filename="../ProfileInterface.cpp" line="563"/> - <location filename="../UserInterface.cpp" line="590"/> + <location filename="../UserInterface.cpp" line="595"/> <source>All files (**)</source> <translation>所有檔案 (**)</translation> </message> @@ -1426,26 +1426,26 @@ Press 1 for Default View</source> </message> <message> <location filename="../ProfileInterface.cpp" line="559"/> - <location filename="../UserInterface.cpp" line="587"/> + <location filename="../UserInterface.cpp" line="592"/> <source>GTA V Export (*.g5e)</source> <translation>GTA V Export (*.g5e)</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="560"/> - <location filename="../UserInterface.cpp" line="588"/> + <location filename="../UserInterface.cpp" line="593"/> <source>Savegames files (SGTA*)</source> <translation>遊戲存檔 (SGTA*)</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="561"/> - <location filename="../UserInterface.cpp" line="589"/> + <location filename="../UserInterface.cpp" line="594"/> <source>Snapmatic pictures (PGTA*)</source> <translation>Snapmatic 圖片 (PGTA*)</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="583"/> <location filename="../ProfileInterface.cpp" line="974"/> - <location filename="../UserInterface.cpp" line="669"/> + <location filename="../UserInterface.cpp" line="674"/> <source>No valid file is selected</source> <translation>沒有選擇有效的檔案</translation> </message> @@ -1464,13 +1464,13 @@ Press 1 for Default View</source> </message> <message> <location filename="../ProfileInterface.cpp" line="676"/> - <location filename="../UserInterface.cpp" line="625"/> + <location filename="../UserInterface.cpp" line="630"/> <source>Failed to read Snapmatic picture</source> <translation>無法讀取 Snapmatic 圖片</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="711"/> - <location filename="../UserInterface.cpp" line="639"/> + <location filename="../UserInterface.cpp" line="644"/> <source>Failed to read Savegame file</source> <translation>無法讀取遊戲存檔</translation> </message> @@ -1569,20 +1569,20 @@ Press 1 for Default View</source> <message> <location filename="../ProfileInterface.cpp" line="1583"/> <location filename="../ProfileInterface.cpp" line="1613"/> - <location filename="../ProfileInterface.cpp" line="2016"/> - <location filename="../ProfileInterface.cpp" line="2095"/> - <location filename="../ProfileInterface.cpp" line="2184"/> - <location filename="../ProfileInterface.cpp" line="2299"/> + <location filename="../ProfileInterface.cpp" line="2015"/> + <location filename="../ProfileInterface.cpp" line="2094"/> + <location filename="../ProfileInterface.cpp" line="2183"/> + <location filename="../ProfileInterface.cpp" line="2298"/> <source>No Snapmatic pictures are selected</source> <translation>未選擇 Snapmatic 圖片</translation> </message> <message> <location filename="../ProfileInterface.cpp" line="1594"/> <location filename="../ProfileInterface.cpp" line="1624"/> - <location filename="../ProfileInterface.cpp" line="2076"/> - <location filename="../ProfileInterface.cpp" line="2165"/> - <location filename="../ProfileInterface.cpp" line="2280"/> - <location filename="../ProfileInterface.cpp" line="2372"/> + <location filename="../ProfileInterface.cpp" line="2075"/> + <location filename="../ProfileInterface.cpp" line="2164"/> + <location filename="../ProfileInterface.cpp" line="2279"/> + <location filename="../ProfileInterface.cpp" line="2371"/> <source>%1 failed with... %2</source> @@ -1602,87 +1602,87 @@ Press 1 for Default View</source> <translation>已有與 uid %1 相同的 Snapmatic 圖片,你想要匯入新的 uid 和時間戳嗎?</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2016"/> - <location filename="../ProfileInterface.cpp" line="2076"/> + <location filename="../ProfileInterface.cpp" line="2015"/> + <location filename="../ProfileInterface.cpp" line="2075"/> <source>Qualify as Avatar</source> <translation>合格大頭貼</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2027"/> - <location filename="../ProfileInterface.cpp" line="2120"/> - <location filename="../ProfileInterface.cpp" line="2235"/> - <location filename="../ProfileInterface.cpp" line="2330"/> + <location filename="../ProfileInterface.cpp" line="2026"/> + <location filename="../ProfileInterface.cpp" line="2119"/> + <location filename="../ProfileInterface.cpp" line="2234"/> + <location filename="../ProfileInterface.cpp" line="2329"/> <source>Patch selected...</source> <translation>修改所選...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2028"/> - <location filename="../ProfileInterface.cpp" line="2046"/> - <location filename="../ProfileInterface.cpp" line="2121"/> - <location filename="../ProfileInterface.cpp" line="2139"/> - <location filename="../ProfileInterface.cpp" line="2236"/> - <location filename="../ProfileInterface.cpp" line="2254"/> - <location filename="../ProfileInterface.cpp" line="2331"/> - <location filename="../ProfileInterface.cpp" line="2349"/> + <location filename="../ProfileInterface.cpp" line="2027"/> + <location filename="../ProfileInterface.cpp" line="2045"/> + <location filename="../ProfileInterface.cpp" line="2120"/> + <location filename="../ProfileInterface.cpp" line="2138"/> + <location filename="../ProfileInterface.cpp" line="2235"/> + <location filename="../ProfileInterface.cpp" line="2253"/> + <location filename="../ProfileInterface.cpp" line="2330"/> + <location filename="../ProfileInterface.cpp" line="2348"/> <source>Patch file %1 of %2 files</source> <translation>修改檔案 %1 共 %2 個檔案</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2076"/> + <location filename="../ProfileInterface.cpp" line="2075"/> <source>Qualify</source> <comment>%1 failed with...</comment> <translation>合格</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2095"/> - <location filename="../ProfileInterface.cpp" line="2165"/> + <location filename="../ProfileInterface.cpp" line="2094"/> + <location filename="../ProfileInterface.cpp" line="2164"/> <source>Change Players...</source> <translation>更改玩家...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2165"/> + <location filename="../ProfileInterface.cpp" line="2164"/> <source>Change Players</source> <comment>%1 failed with...</comment> <translation>更改玩家</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2184"/> - <location filename="../ProfileInterface.cpp" line="2214"/> - <location filename="../ProfileInterface.cpp" line="2280"/> + <location filename="../ProfileInterface.cpp" line="2183"/> + <location filename="../ProfileInterface.cpp" line="2213"/> + <location filename="../ProfileInterface.cpp" line="2279"/> <source>Change Crew...</source> <translation>更改幫會...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2214"/> + <location filename="../ProfileInterface.cpp" line="2213"/> <source>Failed to enter a valid Snapmatic Crew ID</source> <translation>輸入了無效的幫會 ID</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2280"/> + <location filename="../ProfileInterface.cpp" line="2279"/> <source>Change Crew</source> <comment>%1 failed with...</comment> <translation>更改幫會</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2299"/> - <location filename="../ProfileInterface.cpp" line="2313"/> - <location filename="../ProfileInterface.cpp" line="2372"/> + <location filename="../ProfileInterface.cpp" line="2298"/> + <location filename="../ProfileInterface.cpp" line="2312"/> + <location filename="../ProfileInterface.cpp" line="2371"/> <source>Change Title...</source> <translation>更改標題...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2313"/> + <location filename="../ProfileInterface.cpp" line="2312"/> <source>Failed to enter a valid Snapmatic title</source> <translation>輸入了無效的標題</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2372"/> + <location filename="../ProfileInterface.cpp" line="2371"/> <source>Change Title</source> <comment>%1 failed with...</comment> <translation>更改標題</translation> </message> <message> - <location filename="../UserInterface.cpp" line="586"/> + <location filename="../UserInterface.cpp" line="591"/> <source>All profile files (*.g5e SGTA* PGTA*)</source> <translation>所有設定檔檔案 (*.g5e SGTA* PGTA*)</translation> </message> @@ -2010,25 +2010,25 @@ Press 1 for Default View</source> <translation>JSON 錯誤,未能更新 Snapmatic 屬性</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2208"/> + <location filename="../ProfileInterface.cpp" line="2207"/> <location filename="../SnapmaticEditor.cpp" line="403"/> <source>Snapmatic Crew</source> <translation>幫會</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2208"/> + <location filename="../ProfileInterface.cpp" line="2207"/> <location filename="../SnapmaticEditor.cpp" line="403"/> <source>New Snapmatic crew:</source> <translation>輸入新的幫會:</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2310"/> + <location filename="../ProfileInterface.cpp" line="2309"/> <location filename="../SnapmaticEditor.cpp" line="379"/> <source>Snapmatic Title</source> <translation>標題</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="2310"/> + <location filename="../ProfileInterface.cpp" line="2309"/> <location filename="../SnapmaticEditor.cpp" line="379"/> <source>New Snapmatic title:</source> <translation>輸入新的標題:</translation> @@ -2085,19 +2085,19 @@ Press 1 for Default View</source> <name>SnapmaticPicture</name> <message> <location filename="../JsonEditorDialog.cpp" line="165"/> - <location filename="../SnapmaticPicture.cpp" line="344"/> + <location filename="../SnapmaticPicture.cpp" line="345"/> <source>JSON is incomplete and malformed</source> <translation>JSON 不完整和異常</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="168"/> - <location filename="../SnapmaticPicture.cpp" line="347"/> + <location filename="../SnapmaticPicture.cpp" line="348"/> <source>JSON is incomplete</source> <translation>JSON 不完整</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="171"/> - <location filename="../SnapmaticPicture.cpp" line="350"/> + <location filename="../SnapmaticPicture.cpp" line="351"/> <source>JSON is malformed</source> <translation>JSON 異常</translation> </message> @@ -2107,42 +2107,42 @@ Press 1 for Default View</source> <translation>照片 - %1</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="314"/> + <location filename="../SnapmaticPicture.cpp" line="315"/> <source>open file %1</source> <translation>開啟檔案 - %1</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="326"/> + <location filename="../SnapmaticPicture.cpp" line="327"/> <source>header not exists</source> <translation>標頭不存在</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="329"/> + <location filename="../SnapmaticPicture.cpp" line="330"/> <source>header is malformed</source> <translation>標頭異常</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="332"/> + <location filename="../SnapmaticPicture.cpp" line="333"/> <source>picture not exists (%1)</source> <translation>圖片不存在 (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="335"/> + <location filename="../SnapmaticPicture.cpp" line="336"/> <source>JSON not exists (%1)</source> <translation>JSON 不存在 (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="338"/> + <location filename="../SnapmaticPicture.cpp" line="339"/> <source>title not exists (%1)</source> <translation>標題不存在 (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="341"/> + <location filename="../SnapmaticPicture.cpp" line="342"/> <source>description not exists (%1)</source> <translation>描述不存在 (%1)</translation> </message> <message> - <location filename="../SnapmaticPicture.cpp" line="352"/> + <location filename="../SnapmaticPicture.cpp" line="353"/> <source>reading file %1 because of %2</source> <comment>Example for %2: JSON is malformed error</comment> <translation>讀取檔案 %1 失敗,因為 %2</translation> @@ -2310,7 +2310,7 @@ Press 1 for Default View</source> <name>UserInterface</name> <message> <location filename="../UserInterface.ui" line="20"/> - <location filename="../UserInterface.cpp" line="78"/> + <location filename="../UserInterface.cpp" line="83"/> <source>%2 - %1</source> <translation>%2 - %1</translation> </message> @@ -2342,9 +2342,9 @@ Press 1 for Default View</source> </message> <message> <location filename="../UserInterface.ui" line="153"/> - <location filename="../UserInterface.cpp" line="264"/> - <location filename="../UserInterface.cpp" line="288"/> - <location filename="../UserInterface.cpp" line="786"/> + <location filename="../UserInterface.cpp" line="269"/> + <location filename="../UserInterface.cpp" line="293"/> + <location filename="../UserInterface.cpp" line="791"/> <source>&Close</source> <translation>關閉(&C)</translation> </message> @@ -2380,8 +2380,8 @@ Press 1 for Default View</source> </message> <message> <location filename="../UserInterface.ui" line="236"/> - <location filename="../UserInterface.cpp" line="76"/> - <location filename="../UserInterface.cpp" line="876"/> + <location filename="../UserInterface.cpp" line="80"/> + <location filename="../UserInterface.cpp" line="885"/> <source>&About %1</source> <translation>關於 %1(&A)</translation> </message> @@ -2437,15 +2437,15 @@ Press 1 for Default View</source> </message> <message> <location filename="../UserInterface.ui" line="319"/> - <location filename="../UserInterface.cpp" line="382"/> + <location filename="../UserInterface.cpp" line="387"/> <source>Select &GTA V Folder...</source> <translation>選擇 GTA V 資料夾(&G)...</translation> </message> <message> <location filename="../UserInterface.ui" line="322"/> <location filename="../OptionsDialog.cpp" line="704"/> - <location filename="../UserInterface.cpp" line="329"/> - <location filename="../UserInterface.cpp" line="844"/> + <location filename="../UserInterface.cpp" line="334"/> + <location filename="../UserInterface.cpp" line="849"/> <source>Select GTA V Folder...</source> <translation>選擇 GTA V 資料夾...</translation> </message> @@ -2502,25 +2502,25 @@ Press 1 for Default View</source> <translation>在遊戲中隱藏</translation> </message> <message> - <location filename="../UserInterface.cpp" line="80"/> - <location filename="../UserInterface.cpp" line="445"/> - <location filename="../UserInterface.cpp" line="889"/> + <location filename="../UserInterface.cpp" line="85"/> + <location filename="../UserInterface.cpp" line="450"/> + <location filename="../UserInterface.cpp" line="898"/> <source>Select Profile</source> <translation>選擇設定檔</translation> </message> <message> - <location filename="../UserInterface.cpp" line="168"/> - <location filename="../UserInterface.cpp" line="873"/> + <location filename="../UserInterface.cpp" line="173"/> + <location filename="../UserInterface.cpp" line="878"/> <source>&Donate</source> <translation>贊助(&D)</translation> </message> <message> - <location filename="../UserInterface.cpp" line="181"/> + <location filename="../UserInterface.cpp" line="186"/> <source>Donate</source> <translation>贊助</translation> </message> <message> - <location filename="../UserInterface.cpp" line="189"/> + <location filename="../UserInterface.cpp" line="194"/> <source>Donation methods</source> <translation>贊助方式</translation> </message> @@ -2533,30 +2533,30 @@ Press 1 for Default View</source> <translation type="vanished">複製</translation> </message> <message> - <location filename="../UserInterface.cpp" line="256"/> + <location filename="../UserInterface.cpp" line="261"/> <source>&Copy</source> <translation>複製(&C)</translation> </message> <message> - <location filename="../UserInterface.cpp" line="583"/> + <location filename="../UserInterface.cpp" line="588"/> <source>Open File...</source> <translation>開啟檔案...</translation> </message> <message> - <location filename="../UserInterface.cpp" line="625"/> - <location filename="../UserInterface.cpp" line="639"/> - <location filename="../UserInterface.cpp" line="663"/> - <location filename="../UserInterface.cpp" line="669"/> + <location filename="../UserInterface.cpp" line="630"/> + <location filename="../UserInterface.cpp" line="644"/> + <location filename="../UserInterface.cpp" line="668"/> + <location filename="../UserInterface.cpp" line="674"/> <source>Open File</source> <translation>開啟檔案</translation> </message> <message> - <location filename="../UserInterface.cpp" line="663"/> + <location filename="../UserInterface.cpp" line="668"/> <source>Can't open %1 because of not valid file format</source> <translation>格式無效,無法開啟 %1</translation> </message> <message> - <location filename="../UserInterface.cpp" line="751"/> + <location filename="../UserInterface.cpp" line="756"/> <source>%1 - Messages</source> <translation>%1 - 新聞</translation> </message> From 5e6c4e6ad10733e980691d58cec3323c57c81849 Mon Sep 17 00:00:00 2001 From: Syping <schiedelrafael@keppe.org> Date: Sun, 21 Aug 2022 21:39:19 +0200 Subject: [PATCH 3/6] fix Qt 6.4 build and few other changes - include QStringEncoder and QStringDecoder for Qt 6.4 - update integrated qtbase_de.qm from Qt 6.3 - fix macOS theme detection on Qt 6 - bump copyright year and some version numbers - remove ZEC donation - rework README.md --- .ci/app.rc | 2 +- .ci/donate.txt | 2 +- .ci/gta5view.nsi | 4 ++-- .flatpak/de.syping.gta5view.yaml | 2 +- .travis.yml | 12 +--------- CMakeLists.txt | 2 +- ImportDialog.cpp | 6 ++++- ProfileInterface.cpp | 10 +++++++- README.md | 38 ++++++++++++++----------------- RagePhoto.cpp | 5 +++- SnapmaticPicture.cpp | 2 ++ res/app.rc | 6 ++--- res/donate.qrc | 2 -- res/qt6/qtbase_de.qm | Bin 206518 -> 212070 bytes res/zec.str | 1 - res/zec.svgz | Bin 1023 -> 0 bytes 16 files changed, 47 insertions(+), 47 deletions(-) delete mode 100644 res/zec.str delete mode 100644 res/zec.svgz diff --git a/.ci/app.rc b/.ci/app.rc index 92f6518..f247bab 100644 --- a/.ci/app.rc +++ b/.ci/app.rc @@ -24,7 +24,7 @@ BEGIN VALUE "FileDescription", "gta5view" VALUE "FileVersion", "MAJOR_VER.MINOR_VER.PATCH_VERSTR_BUILD_VER" VALUE "InternalName", "gta5view" - VALUE "LegalCopyright", "Copyright � 2016-2021 Syping" + VALUE "LegalCopyright", "Copyright � 2016-2022 Syping" VALUE "OriginalFilename", "gta5view.exe" VALUE "ProductName", "gta5view" VALUE "ProductVersion", "MAJOR_VER.MINOR_VER.PATCH_VERSTR_BUILD_VER" diff --git a/.ci/donate.txt b/.ci/donate.txt index ab58641..407130d 100644 --- a/.ci/donate.txt +++ b/.ci/donate.txt @@ -1 +1 @@ -btc:187NSQSPzdMpQDGhxZAuw4AhZ7LgoAPV7D,eth:0x19d71DfCa86104d37a13D3c5d419936421CDC569,ltc:LKr6yvBoMMGmcxViS8Kc1A2sDjVSWTXn4m,xmr:43TB3ZMP5nk1pu5EQXRGPzdTKvmFEBGgccX3tNhRknLLiUYQ7z7dNedVHEA6WrWdByZv1isvFmjSGhCF7ddx3eRxFdm5Fzz,zec:t1SpfDKj6qGZFwyRdzJBw9w2PTj8rUixZGh \ No newline at end of file +btc:187NSQSPzdMpQDGhxZAuw4AhZ7LgoAPV7D,eth:0x19d71DfCa86104d37a13D3c5d419936421CDC569,ltc:LKr6yvBoMMGmcxViS8Kc1A2sDjVSWTXn4m,xmr:43TB3ZMP5nk1pu5EQXRGPzdTKvmFEBGgccX3tNhRknLLiUYQ7z7dNedVHEA6WrWdByZv1isvFmjSGhCF7ddx3eRxFdm5Fzz \ No newline at end of file diff --git a/.ci/gta5view.nsi b/.ci/gta5view.nsi index ee89b81..56ea8fa 100644 --- a/.ci/gta5view.nsi +++ b/.ci/gta5view.nsi @@ -4,8 +4,8 @@ !define APP_EXT ".g5e" !define COMP_NAME "Syping" !define WEB_SITE "https://gta5view.syping.de/" -!define VERSION "1.10.1.0" -!define COPYRIGHT "Copyright © 2016-2021 Syping" +!define VERSION "1.10.1.1" +!define COPYRIGHT "Copyright © 2016-2022 Syping" !define DESCRIPTION "Open Source Snapmatic and Savegame viewer/editor for GTA V" !define INSTALLER_NAME "gta5view_setup.exe" !define MAIN_APP_EXE "gta5view.exe" diff --git a/.flatpak/de.syping.gta5view.yaml b/.flatpak/de.syping.gta5view.yaml index 2e6fa1d..c9a9775 100644 --- a/.flatpak/de.syping.gta5view.yaml +++ b/.flatpak/de.syping.gta5view.yaml @@ -1,6 +1,6 @@ app-id: de.syping.gta5view runtime: org.kde.Platform -runtime-version: '5.15' +runtime-version: '5.15-21.08' sdk: org.kde.Sdk command: gta5view finish-args: diff --git a/.travis.yml b/.travis.yml index 2a04b89..8dee407 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,22 +22,12 @@ matrix: - BUILD_SCRIPT=windows_docker.sh - QT_SELECT=qt5-x86_64-w64-mingw32 - RELEASE_LABEL="Windows 64-Bit Portable" - - env: - - BUILD_SCRIPT=windows_docker.sh - - QT_SELECT=qt5-x86_64-w64-mingw32 - - RELEASE_LABEL="Windows 64-Bit Portable for gta5-mods" - - PACKAGE_CODE=gta5-mods - - env: - - BUILD_SCRIPT=windows_docker.sh - - QT_SELECT=qt5-x86_64-w64-mingw32 - - RELEASE_LABEL="Windows 64-Bit Portable for gtainside" - - PACKAGE_CODE=gtainside - env: - BUILD_SCRIPT=wininstall_docker.sh - QT_SELECT=qt5-x86_64-w64-mingw32 - RELEASE_LABEL="Windows 64-Bit Installer" - os: osx - osx_image: xcode10.3 + osx_image: xcode12.2 env: - BUILD_SCRIPT=osx_ci.sh - RELEASE_LABEL="Mac OS X 64-Bit Disk Image" diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d748c3..cbb26a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ if(APPLE) res/gta5view.icns ) set(MACOSX_BUNDLE_BUNDLE_NAME gta5view) - set(MACOSX_BUNDLE_BUNDLE_VERSION 1.10.0) + set(MACOSX_BUNDLE_BUNDLE_VERSION 1.10.1) set(MACOSX_BUNDLE_ICON_FILE gta5view.icns) set(MACOSX_BUNDLE_GUI_IDENTIFIER de.syping.gta5view) set_source_files_properties(res/gta5view.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") diff --git a/ImportDialog.cpp b/ImportDialog.cpp index 61f3e50..594cbf8 100644 --- a/ImportDialog.cpp +++ b/ImportDialog.cpp @@ -1,6 +1,6 @@ /***************************************************************************** * gta5view Grand Theft Auto V Profile Viewer -* Copyright (C) 2017-2021 Syping +* Copyright (C) 2017-2022 Syping * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -111,8 +111,12 @@ ImportDialog::ImportDialog(QString profileName, QWidget *parent) : ui->vlButtom->setSpacing(6 * screenRatio); #ifndef Q_OS_MAC ui->vlButtom->setContentsMargins(9 * screenRatio, 6 * screenRatio, 9 * screenRatio, 9 * screenRatio); +#else +#if QT_VERSION >= 0x060000 + if (QApplication::style()->objectName() == "macos") { #else if (QApplication::style()->objectName() == "macintosh") { +#endif ui->vlButtom->setContentsMargins(9 * screenRatio, 9 * screenRatio, 9 * screenRatio, 9 * screenRatio); } else { diff --git a/ProfileInterface.cpp b/ProfileInterface.cpp index 375069e..ce87356 100644 --- a/ProfileInterface.cpp +++ b/ProfileInterface.cpp @@ -1,6 +1,6 @@ /***************************************************************************** * gta5view Grand Theft Auto V Profile Viewer -* Copyright (C) 2016-2021 Syping +* Copyright (C) 2016-2022 Syping * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -124,8 +124,12 @@ ProfileInterface::ProfileInterface(ProfileDatabase *profileDB, CrewDatabase *cre #ifndef Q_OS_MAC ui->hlButtons->setSpacing(6 * screenRatio); ui->hlButtons->setContentsMargins(9 * screenRatio, 9 * screenRatio, 9 * screenRatio, 9 * screenRatio); +#else +#if QT_VERSION >= 0x060000 + if (QApplication::style()->objectName() == "macos") { #else if (QApplication::style()->objectName() == "macintosh") { +#endif ui->hlButtons->setSpacing(6 * screenRatio); ui->hlButtons->setContentsMargins(9 * screenRatio, 15 * screenRatio, 15 * screenRatio, 17 * screenRatio); } @@ -1554,7 +1558,11 @@ void ProfileInterface::settingsApplied(int _contentMode, bool languageChanged) #ifdef Q_OS_MAC // DPI calculation qreal screenRatio = AppEnv::screenRatio(); +#if QT_VERSION >= 0x060000 + if (QApplication::style()->objectName() == "macos") { +#else if (QApplication::style()->objectName() == "macintosh") { +#endif ui->hlButtons->setSpacing(6 * screenRatio); ui->hlButtons->setContentsMargins(9 * screenRatio, 15 * screenRatio, 15 * screenRatio, 17 * screenRatio); } diff --git a/README.md b/README.md index 3713ce2..8831699 100644 --- a/README.md +++ b/README.md @@ -14,36 +14,32 @@ Open Source Snapmatic and Savegame viewer/editor for GTA V #### Build gta5view for Windows # Note: Install Docker Community Edition and Git before continuing - git clone https://gitlab.com/Syping/gta5view && cd gta5view docker pull sypingauto/gta5view-build:1.10-static - docker run --rm -v "$PWD:/gta5view" -it sypingauto/gta5view-build:1.10-static - cd /gta5view && mkdir -p build && cd build - mingw64-qt-cmake ../ - make -j $(nproc --all) + git clone https://gitlab.com/Syping/gta5view + docker run --rm -v "$PWD/gta5view:/gta5view" -it sypingauto/gta5view-build:1.10-static + mingw64-qt-cmake -B /gta5view/build /gta5view + cmake --build /gta5view/build #### Build gta5view for Debian/Ubuntu sudo apt-get install cmake git gcc g++ libqt5svg5-dev make qtbase5-dev qttranslations5-l10n - git clone https://gitlab.com/Syping/gta5view && cd gta5view - mkdir -p build && cd build - cmake ../ - make -j $(nproc --all) - sudo make install + git clone https://gitlab.com/Syping/gta5view + cmake -B gta5view-build gta5view + cmake --build gta5view-build + sudo cmake --install gta5view-build #### Build gta5view for Arch/Manjaro sudo pacman -S cmake gcc git make qt5-base qt5-svg qt5-tools qt5-translations - git clone https://gitlab.com/Syping/gta5view && cd gta5view - mkdir -p build && cd build - cmake ../ - make -j $(nproc --all) - sudo make install + git clone https://gitlab.com/Syping/gta5view + cmake -B gta5view-build gta5view + cmake --build gta5view-build + sudo cmake --install gta5view-build -#### Build gta5view for Fedora +#### Build gta5view for Fedora/RHEL sudo dnf install cmake git gcc gcc-c++ make qt5-qtbase-devel qt5-qtsvg-devel qt5-qttranslations - git clone https://gitlab.com/Syping/gta5view && cd gta5view - mkdir -p build && cd build - cmake ../ - make -j $(nproc --all) - sudo make install + git clone https://gitlab.com/Syping/gta5view + cmake -B gta5view-build gta5view + cmake --build gta5view-build + sudo cmake --install gta5view-build diff --git a/RagePhoto.cpp b/RagePhoto.cpp index 5e2113a..293d4a8 100644 --- a/RagePhoto.cpp +++ b/RagePhoto.cpp @@ -1,6 +1,6 @@ /***************************************************************************** * gta5view Grand Theft Auto V Profile Viewer -* Copyright (C) 2020-2021 Syping +* Copyright (C) 2020-2022 Syping * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,6 +22,9 @@ #include <QFile> #if QT_VERSION < 0x060000 #include <QTextCodec> +#else +#include <QStringEncoder> +#include <QStringDecoder> #endif #ifdef RAGEPHOTO_BENCHMARK #include <QFileInfo> diff --git a/SnapmaticPicture.cpp b/SnapmaticPicture.cpp index 3a0197b..c3664fd 100644 --- a/SnapmaticPicture.cpp +++ b/SnapmaticPicture.cpp @@ -34,6 +34,8 @@ #if QT_VERSION < 0x060000 #include <QTextCodec> +#else +#include <QStringDecoder> #endif #if QT_VERSION >= 0x050000 diff --git a/res/app.rc b/res/app.rc index a0fd25d..b1f5162 100644 --- a/res/app.rc +++ b/res/app.rc @@ -4,8 +4,8 @@ IDI_ICON1 ICON DISCARDABLE "5sync.ico" CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "gta5view.exe.manifest" #include <windows.h> VS_VERSION_INFO VERSIONINFO -FILEVERSION 1, 10, 1, 0 -PRODUCTVERSION 1, 10, 1, 0 +FILEVERSION 1, 10, 1, 1 +PRODUCTVERSION 1, 10, 1, 1 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -24,7 +24,7 @@ BEGIN VALUE "FileDescription", "gta5view" VALUE "FileVersion", "1.10.1" VALUE "InternalName", "gta5view" - VALUE "LegalCopyright", "Copyright � 2016-2021 Syping" + VALUE "LegalCopyright", "Copyright � 2016-2022 Syping" VALUE "OriginalFilename", "gta5view.exe" VALUE "ProductName", "gta5view" VALUE "ProductVersion", "1.10.1" diff --git a/res/donate.qrc b/res/donate.qrc index fcad17d..e4a0005 100644 --- a/res/donate.qrc +++ b/res/donate.qrc @@ -8,8 +8,6 @@ <file>ltc.svgz</file> <file>xmr.str</file> <file>xmr.svgz</file> - <file>zec.str</file> - <file>zec.svgz</file> </qresource> <qresource prefix="/img"> <file>donate.svgz</file> diff --git a/res/qt6/qtbase_de.qm b/res/qt6/qtbase_de.qm index a1080509e0d6e7c2b3e7443fe6132fd7d0a9fe3f..301fa8fe7103f48d68c080f0b901a6411114ebcb 100644 GIT binary patch delta 19882 zcmcJ$2Urx@);7BK?yl<GtppKct6)MfVip64qJSczVs4<pR+7+&nA$idjHsv>#+-9b zm{7-@!>D6UW6p~4zSXVH%sHO({r|n+eSGxouCCg(_KNRXRc=16z4u-_vAC^f6(Xug z{N7@q7xB^?iR6ulwP*)y4D1JN0z3fp2mT2RAlA|!*pyhX2n+;v2Q~u^2Q~*T1qK0+ z0b3Ib-2n^(UI(@z)~X^foNTOBC_c2sffQf_a2l{3@HwzOvDPlY4#3*LNML7RDzV1L zfmY(>qkzMSH5m)MPQ2=FBB35p%|i~X<!wi132<O~bzmzZr>zp&h&OAE4||Ar=uISk zA=Z2sk)i>yplU!XunTYvvB?=k<$Z|_S_?(t2C=UlIB6fS6|uO2L{;@T?+>B?NrQ8U zngUzNh?>_RUgjb&l4y8;;1J?fEJQ&zf8yRYq82-WFhPqvBKL`Q<lccq!2!f8hXJ#I zONd&B6R%x_D69>HflAxp+R>wk+8!bv_<|^67dF%vc#zn*azq_A5)a089aD(6g$6ry zCti3bQD>YV2~*m-^d;7;B~iEiM9#i;<eea8MjY`pGqI}MiF(u|cCIN={9@wMYY~6h znfUJg*l}Z$kIW(J$L+{HuakV-XyTr$NIvlck?Tg1XKf;0Za&GUc@T{l59|b!2_&Ch z3HXw1^2JcAdn8H7D?KFnl5<3N6n5kfYLk3LCNxuw<SXl7fe$3#+?4pUa=>fEeUeDN zLrzq<56Sc3sO5b~eiGk{l(8eP;!E;Vo<y<;AT(L!3(3zCe54Y|FN}lF<l7t{MqP1W zW?KhlL4ZrXI5CUlkE;-UEMQ00W0D=YFLs3E{Mk^Fzr}eqUpVkc1rp>ZiPySCg0>{l zn6o4lJ3>?_h6G~((Xb>Eyv`AC<U~UKhQ$4C8Tb%^8|=0t_g?^<M?9bo3C&@SVGl?M zz73leCZQcnP_YJZ5wV!XB*f+t4PI$SW=XIkZ$6KNxbwtD7a<`YPTeA$gcO*h#Y+;# zu7NL{aNt#c2ipD^O+qGAR<s}q(+?2q+1rl1l`{#mpt9DpNtg?#3G*Xio&fK4Ct(G? zw|Py%YM5@^2H+Rq3li2s6K%2MZJUTn;rJdi&JQLb4>#^m&w*FZIPe-abZj5lcqbVN zC*h494w6`?3-L~$NSp=du$V|(Gk|z}Fp01gPuNM~RUe|PJ0!w!d14wVs<b4Yd<VFY zc<+*=fM$3~Wm2qsO}y_lQf!6u^{YmPp7V%BPp1NdCJ`TTkP3E{(3_kly+ruj+fL4M zgvYe8<b35WG4F9yXtR~bWTRp;4iOvLohnLBdb@-j`Mm>F@j_do2?AA=eBjAZ@(Mga zlz*4Jf^p*~@5xItO`n<MH5N`;VjXY|t{-hje!mHMO_z?}1ln+6x*8vVlOB<mq~ZyU z9QYxbyr4R|eZr3X{zURRgs>`EoN7%#J}B9ZYX7Du9=m|*IjtuCm8iiEL`9pj)abM` zv1u#GzwR7jg%uRAF@`8=Bn2kcAm+K8noXO6@J*y<wrP0?pH<Yn@-XQ1JT*_RgCCYs zP&vf)h)4>`xJ&%E#ni%UDDjF<s71}GME=PR{BY5ZtVdBha<3R_5gkQr%rI&>5gU>@ zQLqN4sa%YLJMIJaqu^n<-uRw^KMo=KWdYejI1<mmF%;rE9BETWA?6Ll5C2J_W0BoP zjs@l-4DV9tZrHY30Sf)&F448m)M~&OEHsc>2R0@8<U?U2RLG1^DeM)}@#vz|W(=Hi z^e$?%PDae?L2Y&ofDcrnHlLBUN57}=+Fg<AQ*G3C7#1otliD7Bg%mo*fk&26M8mEm zlf_cRwSh#iW4o$5iH*;rb_0?5#`{ydU-l6TWYliVA|#w?cH}`@s9ok%;z19o-9)70 zu`8(ETO_O&6R3UW0wV1)YCjRhE~BOchuS>tA9%}r>TswI@sJVJ;cy-?%dgbo=nRBo zb?N|#dB{VG%zK3euTtdEJqXv+6nP&v{w$-&XGkbv8j5_2x-nEv9liG8dk^Xu2SLK- zQO9AQ5S~udDYiQCh+EWI#D?9@*pb<$^rg;S;1o^|?8r@JsPl*22*(-J^*WqOd6G=l z62#xtrnqQ<m~8-A9!x=aPN$x}ImCMwre0yghz%b}38N7I3Hg+CWCrokg(#&jidu3V zN^_k`Y+-ZiQ?WKNgn6I17-BbGQJ>*E5&x<2)K8K$y#@7)N5bjzp892YB7RLYKn@!f zzGz2Y_#qAbbb$Esg*3d+1l0FucI5ZE(TIm~;)7*0^4vP4;#xGeS~Rg&)hV+As%ys~ zl=%t*Z0$tjYXlQZ_Mq{;tASRUSkoWzKVm1%x_yV(oPo5c(*~&i2CWU+NW95#S{qu5 z_}HbirMDH|^JvR^XyWSv+M8L1*zGBlcNu~P)}#Z4VdGAN=(nv4h~+$_!<!O`sw{Ef zigga$80x@hx9!NvNylx8#47vP4{+^AI$9LfPuT6iIRohE<Pc(gy3vUl0@0PXbV>s% zRxpFk?CVPW^<Fyrp)K)Cne=;f5YZne=~@LDQQ2{HyYf0>A%lVIfxCg&SjZRPMo_Q@ zz)ipbblW!m8j3<$y7M`WsL33<S01$>pguhe*$(fnMNg~+iBA;h>6kR)1uD_Y6DDFa zM$wxyNGzkn8QY0m-|;0A4zDJ%aHhBd-|#fCg71-04{T!2&5wWwq%ilMW}<>kSW!(V zcttT*^zcGt-p<Tc>}3IXWj$8nqA#%mADMAL8RD~gGLP=b#QGVTX9U8<br37tz?Im( zi>%@uIBT`O%q#mmv7K40(wU7!AvKwIG)#2Tz<i#~A@ZEbs*gb88Mu(ukHhg)C2Qzn zCHi$gYifK)Y+ggwe9;u5`Gst(MaXNgo3$(?XEf3I{;YkQ7~&UxW8GSUCS7UGx;F+3 zj=s%IZ5kp~`!n<FImA0xW9GNez_2f@2Z|4M-NWKXjwD`i6pNozjd=eR4$NN5;(x71 z?A{TU(D5))g`+ItPiQJ(ChI*io7i*P6_z^gH)8h<tk3wzsOvE-eKWjXo67obJ4{^v zI~&mqiDc9rmbqsH$Y&=ueg?eVre)*bT8IwKXA^{{C|)jXMqPiR_BYs!p5esiA7nYd z8c~MJv3bkN5&P)L=ACR${MKc*6j_u$*Jmq2Q0#0E$Ffx;;)wQqVyhkn5c#>WO&fiP z;!3j3ZQvX4wy@1nQ1zyxY;!ztV-DM#Afb$HP6Te~#Wtr(zgK75>LYP2n!<J?ny6kN z+tYv(uMou!e|04`b{;$NC&D(P8@n_BzXy4<%P@_N=c(AeA&rT4RAEoo=MgPg$)1O0 z5*_)(UZtTY*j$Uf8#$bK`{(T4)qLX4e(ZD4;Y4+7a#{0SVtX!d#l#xKXI$f|tq9|a zU3tOyAfn&i@M2d3h<ym>C7n>l_XTiI&tt@Etl$-jl^{~R;1zP0A^!8u@yZS0mF<V~ zs+T<AgmrkmTPKJQeZ%V~EF<>x5pOVZ6R`ucc=HAjU{nn6{?L`E`d~XU-(21!<pHs) z#dyzJ5Ol7L$H!sE4Sacg2I~CoC>}ortkbrV_a1ZygyaQJnF=Q^_>%Xrg8%X2CGi1x z@)jRZXFjnV1^M_T5NL8!KB4MokVr2+rF1Uww-xx5h$+On%;wWfH;8qv4ZH~)47>&W z4G0Z%DZpp6pF}Lu1vnYF1egVU2E_FpYXPSMZG48U{WN?ygah!#P6ps~V0$2nPp7$j z#t;yWfkAvesvK)qozH)cvKnxOFAz(RjK1&%-CT$a#rdN36^OQm@Z}Oem^8|P`OEmK zNw~g*Gv6=_PJO;L--v3<CNJlk+hd)k^SEuZR6cKqa|!u<8Q;<dVHGrrZ;{Gm@;<)( z9llRk$afC%A^tvv?<$!~q-)4?ha&EEbM45_tl+t`J`!&=neWE$+^ss_-SjSS7~g~Q zxZ82Qk2?|Hn9cM0k0<^|dw!?^GGy_sHhyKlJMpe={8sQrVm?NGucraI-I>1>&x2^x z;;)7-B&s2I;G2SWWZukyHJjOy7s%&tE+r6sSis*r4*?g9mkBk^#2cTN2_sO9UeA)L z%As>Q)lF9L@=fCV`^a480HbWfWJNwfvW{D1MSDYlnW3_xhmcawR+be@M>I4`l$8*X zxkeU{m0T1DCoC#6J_Hpjwo_K>ByMo`nXK$qB%}{JWaYPlx&;oCRXAS)y<Ig~#qy|j z?OOn0^YC3j*gX6b5GHS15BMwMzimH!06lKI4G8CJ`yPlY7Eueh5ZDI@+ed5yE(X2^ zE`cwk$tqTc0FkLOudynaDqmJ96slfmlhsoWC#L&F)}S~v*I<my?*vSFy}zvCF9_2` z!Loqjf1o_yl{IZWh-@^awXCHD@qEBf)@lXX=ekX0ojx8QQeTyIj&>n#IwtG<ZVI^F zdRg}y&P4CiWziRgp&SRuV(z{n+I~|OdpnQ#r{b~%E6!i=P?lV|Em7a?vfd>b@n5>h zQv1Od#&?%lucL@{?<PwtzX>f`M_F36VTk|BO=W5GQJo^s$OZ<)pngZm2KF)$HxHK$ zzSb2Pakgy8F5D<nCmVG`M$G@QZ1h1VV%s~)#uk4{EPcLgY}hqoZ+v9q&JIFZZYY~1 zQxfl0N|vny>+KmVoAclt@!w0z7B$BDb6sW2uAd>gTUWNKzilcqT|e2H!yZKYYsfa< zxC2^TUbgKiQu2XSvTYz7ba9nz=UO*3i-EG8U(w6IXfE3$hal5DWqY+XiMMMd+Yejv z$mOyFY49cg<FYd&kivat%Px!o8#Zo|U3?Ki{AjT3#_s}#4`H%fGtqIqxGlSFQ-gri z+bO&K2G!}+J=vW~=ZIF{mEA81XWM;4_UQaqV(}z<+z`HSr@8F4(_v!AYsubPq2kWR z<&@u;_(&(Ys2M~w{gqrX2fQJxuiPc428I%=<%J8}AYNyeyvP$c-`?u-vdv-Y)gE%M z9QaJ{9&($H67l%_mb~(!Jfc<O<Tb9AB3}KF+;@0U*gQkt(6<7yt`Tzo6gg7qetA&e zaH3+X<-tXMC+_vTymdx8QLF0mHh29<#;eLBFT=(+0_5G2HW51$E|2c-Pb~O3FaQk5 z2y6;$Esr^u2#sv8$<3+5FwL4RkL^_vRd1@iSAZV~L{)kGXI!vOFHc+{C%!mNo)jHJ zeA#9Bpi}ULOV#B=1|qk+HjxiY1|84vmXGQSdOm!qJaeQgiqLcU_$#2<B^SsiuSz7U zY?e<0|D%}=<<oYc$#rccpB{vMBF=Wh@nNQu9eIU04tzREKBN44v`~}eIYZ!7N)LI? zx@*K0z2$RdLB#7%1x5nT0xiTF6a=D%G-w4JO}yT0;0)ju;4+-&4%`N85Bw9yO9Au2 zBkFaN&&8aM`|Srt5^u<W7GOi*Xe@XXh=u%Az-7Q@KrG}p0*D0~jFZnx3m}?TTt2_y zWTL(2<n#Z?C35N@UmO6<Jv|^_9Q=;Ry^wry(thv&k}ur_r`K$gudK8P@joEK{(<iJ z+mU;pbl`)5@|7#PU`FHTz}AE1tMAStF4mB5I|An7zubX?-Q?R<cZhZtaA59H`QhnE zOqEZ_Pv(>d2Yf9*RToj<dQE;hwhbmG-Q^c5;=AmE{Kn98HpJ~w`OU(5qNUyCcaPU0 z?(tgwAQYWTwWh#5#C_|@|D5WM3$Mx_4ntx(XOKUdeh8GTuKaNrOyhe({<JM7oZThF zgtPk>U>jm46A)C)Gzo|dXxa;m0KNcXz!_BvXv2gvDhwYw0EYl0f$QY&f{<7~jgh|( zN1_-rOa7(Z2x2|<$-hcF=+jc*zceA*w_lKzL_8nO5QJG$hHNT`YtaGiJ1MBuxY6&` z1ocoj<tVG*yb>9(R#BmdYZ&o!y@Vn=hZ1e6DipC@=nAhKAQb(8xL@{ID7g@+al5xr zax)0SmaT$uL_G1jr-d@-mJ*x2Tkt4!n?RX_vSShNql1MCzf~hTHeRS`h9<Ul6?~Rt zfXwa{eD5A4-l)G&dlFJ}qh~_x<zG<^iwm`Po`wK#gnDatVPic6n_tyML|*5FhNaOS zzdR!Z6u(3ix>*Q3xu5uvK0@>N7_Dv_DFlDri!jv*Ay45{WseJ?xyy(ee-v8vZ-l|b zGNE180CdMp=<u`|u?sJSE;SH-WlsrRcF!SNKFEO^DhcKqAHlLu3Feyhh?!+JA#QC~ z^y@02*JgxQ3pXJ#1OvxIb%d1WmoaYJA*8gNLUbWoNUyY-Xv%IOJ!2q-P4|U<F1T)G zxG*ROWjkP(Ft+tIqU`a)*wL63o7V`LzE-sDt%OWzHZ)|ckhv3yE@ZnfX&FpaX1I{0 zybFPCzQVNHD&nE;!t`dIL=!6uGcF->m7gNyjGB(|TP-1HDKewiTw#{iLVS-C=9GZ9 zdlwZJ)XXC`T`4T=KA2eA31Q)hNU+}8!t&8bOqI;S%6hoLxR%07zdM+s<q9iX;QNDk zVRc`y?Qu3?ZJo{_rI|~GwWIbD58orKosfzucU4&54ma%HSlDz80u`JmY#w!<_>M8c z)=Wf2`*uREZvYa<Xknl4Q4A)(3J3k+L-QsIzx9GZPc{fgb0Oe{J;FJ6<dI36gv%X~ znkihkVu9v5h6&fVqee8ZE8LdlA^v+Qh1)~nbVV|SI};Y+h7X1Nu~Uf^Ehs$9h6<-z zg-7!i5nsJQc;bcHP%}aJR2{?VPTs<oQs9OG=_2!vLCe-!6z;x2>*XhE59?7=g2e(K zJc!-}iq3<gFiD*wx<2=TX%~xb)wdDlmKWWI|B3m(YJ%u~8bu?srda&uMmS$Fu|$Xy z!YW@Z^=LQIx<JvhA;PDfn^@r`%4^yk(JKdD-g}PdwH{@7L~*f_2NKfTNU`#3gz1C= zVwFE&is&(7wLvjpK6<f6u|dQ<wu&{6w+35&EY>`!0a?8(*7mj?g0s{V>lYnCeCIK- zesL6wgD1sCML`x{%oiIkfF{Q55Stj*!`beN%}!t^L+^;eMPGyYj1e7C5hu19l0v*o zoY?v__`zfku}zkdIKL~lIfe;Ht*K&oEXw)mvtsxGl>1)Q#R!h;w|)>KZ1})jONkNJ z+9Lj)#dhVR!Du>)?M`55ba=QJnYRNOafaBjMm)mrl-Tho;<u6$@C>jy@GNi;@EmZX z*onC!=f4xXNY!+(huAf#8u5(9Vplvh;Tf;QZmn@%=U!sB<a3xAH5P3#Gd2;0Ws9+K zza!Ug7JDwn&R-T0dxhnaj2#veJ!;@WXEEtYDDnKsV)6@^BCfaC`$1_mt=+`_A|@V1 zI@^(rixdaeL9se`S{#@*5n<g|9GDI)v``$l841kxn>gsieGrj};*b$*iLFkviNDM` zPV9(W{N+pu;$Lctqh8O)5GqX^FC~y3L&b?Hki5tZapHZ{{awq&>;g@Y0ZGg*i|Dv9 zP@LWwWYkhv%;~cL%x9mNGt7!7DryG~nIg_xT^;?tm$<mTAGqLjap}$(#Jb!Sm(Pag z&9-!LWxuDy->ei@&Wr+SJSwgk)*kUXOxzR+XT0w&Zu!HCCtJH6_-le4nSQRgr<;~| z^ONE}6FQmcQ^b9LoWN|inwVGk98usz@zBHJM6I>r;lOo7Z{~_e3e6xYw_iLmAK~d+ z%#O@fyPtUE;6`G#?ubY3$6&11z=3a#c4R)Y99U<)0~>7@kNlZOe9i>%m~S1TwUxwU zjh+(ebH!8Dz;+Xwh^NOv#ZwlG7kWzH2a1=x+=&*R6)%UP8rE?VFOOYFY)OoG^@t~) z{~ZhwuU|nF9KR&q-jqw!d$4%7DsFIiwfLwPGGON=;v?%9;?`5*V-xVVr{d!ssBXpl z#K(`@ARKeVCl$&Ozv3l6tzQF)D_?vXGlW<PU-8*Ytg|Ue{BpAgv6|-;l>8g!jH47R zeKoNPGKGBFF7W>o;}yzHd1x43Dzx{Z>WD0bemw*Uj!-yN@+97Jp28^|UOl0u!hP31 zVzGl1#e2RXw!f~zIARhsutHH~7fhFaTv6?D5pc+didw$NbXRsLYV|^2a4SJkyAXWq z&%KJe)lsy(N-F$LS0vU{P&BM(!wEsB75>vBFa;Z@2vl7qcDc8rMHOVW=8qLETVrRG ztFXs;a7Ey0Vy(6-+Kj$Ne9SvV!~n453g;A^R~8^P__?A>Wh<VF%~O~xu=Sy;3RB7f z;u@nO=5YqmO%FwERV20&fr_|Xd_PlP5pR2m)af-tk<b*?ZE8tHVr_)ihS7=v(t<;p zC<dl?grw1mfipc2My(V>erZH(O_*Z%l&&btM#bn>u=O7<icFa+xSvIlc@lGkDQd;U zju<>lX<|nnY*kF0brw^0y<+w>7h>z@E9R~XAX@N1VVnN}PSR(aV!?Y4WWMf-B@a)a zktm~B+w2MIcaUOjcQuhmhGLy_eUQq>iVa)O5<4_ev9V=+Fru%DjXP2IonsaIwjd0P z_&D&yYDJ!tGtsSmii4ezf*1Eu9K5)J*ti*r<F#<Sr&e(`bRkjgaGT=Xemzm?(u(u` zaF!mO6z5}+GAoo&TpZ|xhe^8?m*y0NAcEquISX~$OL46}%INQV6}PjX>NY8g+aEU( z>+@XkXh%~#x_PX4_F*`&e7WLz9(H>0vm*ZzOzZQ9;!DhVVhh$Pwe`vnmpxP#oO}YE zku6N=nhxR+B`OO&MsDx_R$0cjo><8!WtoSPV7HZ?lXKDEGiAB+j9BRbO0OIXiqAQv z*H&~!y(=p#g+kEsJC&6#zbAgYywV$kYx40>`a~iRbQ`Snc{d*2@g8NBPE*iZo>4X! zc8hrFU<caHG*bFi^?~ZkDjVVly8Fg~k4GsRwSZ~7N+|uULAWql*)$d!+I30UbU`A~ ztg6bu52$wSM=P7%no8{5b!GFF$fSomD1)A%c9guJ4Bg(Ec++*t(A&t2H(x1RTeg84 z_E5I-d`dKXmmO_1x4E)I1Z+HTmon09BI-3t*)_x&1BQ)2sIc8vWw-HJ#IER--S5IV zi^V9T!~hVM=gO$A0`a7K${s;zC`K(+S{`~3tJF-H;7ho%UTNI{&1H2{_N|I?ThUF~ zuOf<3+3CtbUmjp4yif^e2LE5VOF48YoTTa<<(P=U#LLxJj$QdXFhM!K;s`uqk5o=& zpj176Q%;SBrsgLpbJo-#R%NPk@g~^%>^kLAXVB_8MU~5EyAwC|ci`y_%9T;Ck>jr` z*Pn#I2dgNzE}w(c{#CiXKmw*@T)D%^hH`rK7kmKzaZI_>6UAj;m~!VT*sh^WxhoSH zE2MyOPt<9Gv6Xq3EO=m1OnJy3&128y%EKa@%lC`&$VP1WgNO3S=JR+O7Oy;77<JyS zsq)z210W<($`cGXPU)#UInRUmHk0yfR~6CXeB~9}lrorNS5#iZ#FJVMP~L8LhghTf z%6s8miT_$ydH)H*X2b;L^FZ9-;}GS`BKgF=+*Q8Z5lO7!cIB(&!$gbXl=+LQA~hFK ze(=Qn@L7)XLs{&&%opXSeE7~Fo$_;oWyJ0_RLMu9s=DN><ae+k-!&?mFc5M7?tx0# z+e|cfmr8YcAu;VS;38s~lT@nLF~nnHRnAWkUa#Wp$h?lITw6ilR@+pCL_|a55LL0p z(O^dPRK+g8Cf;q7s&ubJ;x6-4Wy+v`IJrjUb!!T-S+`Y{#;hkgUQSir_>9<qMmAOT znZ6*K%T=`o!wKC=sp_}<f<FF+s;SR9%yO-&W>21yOy;I)L+%)(uU2&&)Rfrc2dYkf zGjQYgsxFHm@aJ$<)I`*P>xEQNJG-MAMyaB5yW>@hWK~?mOQJt-s(R!?(5^dG@ut^! z;`)ajnZ|ZU6(9Qoe4?JJcRw^99p0)^y%DGWOH_R_A@MR-RUh<rZ0RsnpPkb8C93pz z;F1@rzP(Eje>F;FPsyuhsD=)Jt=+n-hV?-n={Zg{W=jhYlKQGlD^l-}-KxwB(9AM} zYP`w^lhk{vsTtkDh$1_yru{h-38b=W?jj_jl#Qynm(PKSSXA@J=3zQ^K{bB^P$+3f zW|*p4^f?C3IasxL_;BLUfvP1^!g9)1Eju$BPd4*ZE7y!b&p2MS$`4Oe4LPc<_uwO& zRypwX2-WsPPW14DYWrFr%>VmTSM9tAFV23V+T9*bb-JJ`&*M*`ZC_Of)|xS+aZ(+L z^deqLP#wh-jEYWDod`!0dib2`yv~VOhblniiw^x&7mvY7HO*94_!45rI;j4j^Tcmf zS3R0{j$}f*>Jgr#%7pEzCz&u=+4d45{>$!CJ#CtY#Gq5X@I<-2zC`tU&v2rv%~fyu z1fiL9SH0VT&Zpr()rYNT;AD$bAN@t_&{OrPnkVtSIjYa;0my(|)$#|u(LwcAi&}io zuA>$|foRmdq*e^v2u}FBT73#8i1SuEmq*piE2wsPVk?HXR`S(u9#H+P1!~VCDJU*= z)aA<WCsMX|;FDeI@|_zJ8#zQ>Ar?;9rGvV{Ch&udp6ZH~??Uiy>WT-(6KhdO?c=wQ z=+Pjx&rRfq7Z=slmfXdYk{jxJ<9;VPIY8Z@@E!D+W_81L$S;OrYJXe5KZ(oZ)y-9| z#P{q{H}3=6w(F*DF}gIdQb*KbPjLKpx;pIjGGe)5>NZza<E@vK>b4mwv|b+SwqKAZ z%Bj>5J!_zLWT_)AgO0nOP)AB{I(aWrcec(!`QEPXG6@0~ucGc+7MgCfLfw6xK(xY1 zZIeE5%|UgP9GUBZt2(;;U35H+)zMoJX0{sYm>yQ5`eW4QSs1z4GSud!{oxB+)v=#I zp~kjS$N5Hp`E*vtW$Z#*-cD_;-xg%EqdE-&@e&CRJRPF$3ogi9^y)#crVy>4t{%P; z88XdeQx9L|K~$-ddaOIbFmaH2?5Y#Q2Rv0z>Xe5;M?dxSpjpV(A?ln2?66!_^{f&c zuji0@)=C$mw;S!qoeHYw#%>}?`&~V^=L_Pq8>xS7iTqJ5T|H0orI_{V#rE$X)k|9( z25;D_UT*UsUexx?@!@1o^-9lVJe69kURh}bW;`zH)qWrF5ZPV5{vJ-O@kYJPFNN46 zAN97Tr7$bDsdpu&U~Vu~y(<Z2I`o`+cXv68(^K{SbDUV2W9mHpZ4i%|4m_N!KIq&8 zVg8HyU|vCx*up?Wk1e*P`cNO(Bs@xe#0zCJUJo>ae%DqXiFd*AN$R6+p~UVLP#>KF zn@#AgKGk|F-g23!J~b%~)39~wGwshIe?3v(T@gh5SP%8x^VPxaGS&BvJjLwznEL(! zS7LvDRzKKTm#Fx4^`k%)*mi>YQLGC6e_x~e**bWs=8O9IIyjf}KJ~jA<A~NwR=+=j zay!1HI{#y7)cN`9&m&Wb2JBOR9#fFWGDQ8gp)_D9q>)E8LzTOu5whzL3(V7~ro+}f zA~dRZb?_*rvPNCX0u#^Ds8gVNAEr^~Od-DNfksoz74bi8x<)erl9N%RxrLoP-KKH+ zV;)o<qj8y!6We~)l<~F_bI;V2a~_Ijw5z5<#VkDYP1AU-un<d8YpV3yj|A3DQ{|UX zkkRFu+KqAJi%m2Q8ew2@tca$e|3cyyBQ=erjjD%e8t3E_A3j9Wq(T?$cub(i|5XHb zx?9t7wF|L@&osefu~3=On&7v{@lVTXLZUmP-oMhcI$x65Fa0&)rws67rfGN46?44J znvRBHcoAWXrVCzFphm|uU2egttL0}Ul`mu)bW;=W0?rv4q=}!Fh6zp?P0}Jn@8eKS z>WyUL!a7ZQ?*@1-8K=qcM@{SYKr=9G5e6*lGy@~&62-b`>?LN!P0esUf@Y$x=9e}I z+UX}XW9Ht(+X2foW0ec>oYbNj8`PKBi6@$|ACS(n%WE>5yTZbKj%&tU)xx*iX(pb6 zVyh3<O!D{wt}E9}_Gtuxc4%@6jDV|^*UaXl&`e*@EO3KMPCl+#AYE59(1CZ-?8qN% z)hxPz{k1QqS-R5~3iZ>h7=9h=Hq@-_T?<SxN3-Vl7GRVL&Bh|*G2wapt7hYISYlqD zX1CRcSoP1EJ!+8VNj)|DdcoqluXf~T-fQ+vLW0e=Y4+{ocm<`f<`ABDP;yPpZy|80 zQPVU>Lj6D=UTcn4Mr&H`nC94)hv<)%YmRMyh1l4lIa_Wrp6WBrIqv`@+O3)k6>QGL zXRgp(xCCE5-9&S#m<O?$Cp5orfh%YqX)b$iASy6TbEO$9c`HG41;^QtOPZ@SA%L~G z<`x9xg^O$M>;wDXKU;H;9UvYXqIp;$gV=*Rn#XPZV0qHK+>3Pz9n!p-i>NRD!hxqw zXkOd$5ER{lG;gX%)4DZU@<7^X)lAE3JjH_)ot7{8lbC-Gt?XkB*lw6s?we06Y_V2& z2OnuuS}O)E!%MdZwc@53I9^k$%nTwLc~GlaisNl2Yc<<(Je+HFLp|Zb9km7lSz~jC z*6A%;)8?UCTcKefK#wbG-L_)16yvEawhO+U6|XIRMNgFDtu67|1rJo7XpO7kG^~iW zl*Si3@2f2x>Is&9OY3tO)xLO5ZS|WaFxwih^*vDv`Rkar?l0Kbkwsd+lURR_w*$AW zb>NO%2j*tj93M_UwIeHb(Sf~I*^%d+(Kb2@PFm^@ZQ~nybo*tsP0PV~3Rl-Qjh%y0 z)JSbhJ2_W5@LDTv%gMX&YRWooNYpLjVHdQmX2B%M>Do5!#$!;^7l@$lw?-SjXB@Hd zwt?FAN$XLY=4&IR5z^=B+D>lg&@|_0J59|&aebxjnui*8ZM-)2ggdc|3$;B^WNBn8 zt;MY=(e;Jep0$!tS_){B=YbUzAD~TpjuKPDO*?$Dp4jGS?Wo-O7%iREW}Zg(u&KIs zT(@xeR5R`PV3^jH`$0Q#S6ia0zc}!Do*h{gCkNJFubrGTpJ?+YZPtT4q8gcYWVKpp zr?9KYf3vkyWWc__hDA`4I%}sKKn5R0+G*pE;oD!<PJgt4xVS|-lU)Xf{;bW3o&j3Z zO*`uo-tfk|A==r>rx-8n)6T9C0~0sZ&Rqh59-6g_KA4I9+ETl0v;s`+xOU}UALK2i z16NLS;EU^aWECt9tgf&l*WJ{vyoH^gy{ldA_YUpK1MQm1$Oo-kYS;dPs4*+FTTOD@ zztB_dRvT2Dm#f{z&BUD+YIm?y;;oNrcRDS@VC0<k;OupHgtSC^>@|KbeO`OKL@v>^ zNbT{f@aiHbv}cAs1!*p#z4&$rSVCd#)i;MgKVE8Yy8n)+1ZM4Rzp2F671ut9oPvrl zSo=tN;8OXE_SFE}YsBLWZT{gz;!DfuWE?$ir`>ksqjPog;pg#Q@?o7~lt6q%Kb`sr z=!RQ&ov!w4V)KjZbki50u`=llMhmeOI-S#7-1y8_U7;6Kh`VR&3L~HJqSJIm4q)BR zO>`yqfRHVzr7P0_gP5siU3ps&PUw75=jFE@U3n*+k97ow<nMJg2IYds?9|nCt^uNS zN>_U^Bo9x~)!hI=<4)@89menX&*=OoY{8?XQ@TLB-_A-*)3v;aurpe8t*x8T5kAp{ zKduBH>86W)0L{53=q!Q$*w93sWz|$X>mH=DSuVk;26fX($g6hM^*p<pSpO!vggSR{ z{ID)@AyoT$w=RuVV`5uJmv%&rNlm^k?bBX7TF%w=DZ2>dIbD}7{qDL#mp*VI@Uw0} z<MqT&1?dKKT1_(f8r=|S;@h!^ZrE?HiGD4i8+l>@UNd@S(~YkP)lLb~jc);4FLu&p z&8&bYyZO2)L;B)%f$F;K{g`EGi|A&yyaSq1M>l5-1nx3Jw_s-^UaE7_Eq~nxFIpt) zHVe36sV2J3-WW$5?WfzD0Vf-FUzb-J@5Q%_(H%Myfr0Hp-LaX_<fTEnlSj^B?qM6K zyB>wi_4%UiMjjR%l&`x}_8KHEtGnM93oN>!d$be9V@M<2<MZfqj0JVit?=THjdagH zgyS`&`nvbU;f$X)>E0hX1M=*r`zrau@;Z7tKOSR6g`Q8EgqQ6~>&0}G;Te_m21PUC z>hAgivk_%BMO(**Cqa6bkypUp!}W!LG-#UM?HKC5P*`6y4ks#(>Pz6i5U}V-eaVst z%eQCsWp3j|ta5|&6-TZB4e6|}xcDU~=yJW!FIG^{m-@<wkf6jmc4W?z^tE1~KWg$s zU%TiRqNGCl+S|V%{yh}>diuLW;qUY<&g+R<Y}L28<%tI>r}Ux4aih(L^r6?_OnX-8 zTeX^kX1TGxo$qagQ6qi(TVII14AggM1LATgR^MrD42JOS^xdBw#)H;my~*bQidd{Z zPKN6qKhwuaZ;W(3skiim33hGL5AhT*;hpnLKcX<a(>F;!DlrSMj#t-b7O74wb-sR@ zw-fO}ar$YuMiXbD`kAL+6K@=%pWE{m9>m_%&%KPezSTiL{{u|YTd!YJ-VfJ5)vs?3 zUs?Z3zhP7i@ymtu8{Z-2ZVS<GS&I%baixCyLOIy~4*iZ$+Z@cIy6ShVhLa^V*YCbw z7v;8^e&6gxM71{RkKEe_=OX<Hxqw6!uRmY@9GtJJ{`?(3qA#oTm(F_Nybk)SDbUcJ z9r{0}K_ga+{&tEh!Z%ufw?tcPq@eyTEWu1Z`g^jCpqiWY_y4Sf7Iu^Vxh?ZOCN>8B zhm^e-GxXDc40Hul(|^gyLfIW-kj+A|nf|LmS<4AF8*NZ;#_X$Ru0itzw(LK{;1VBz zUUsR$ZRrxsEk_xOw5$d}Rfb|U1(>wDp(F(2A0iE<%P7(97d3cpuYrecr3{t47vf3s z34_hM531aaJ%%cl3dEZz4ORNW6uA!#RVMGjyDBb*s<XihTs9f1Zd!zAR`G^v>1|<x z*@pTBPQXVd85#^g(Www^Xs~_+@oTdUfwgK7&sl8<?B@(}eZ&wr^iSeL1{#_tAW>yr zG_;)e5@U(0h6uHl*xJfAL%U@lopaQNPErTw9c75BkwX0ZWJ9#CfSLA7gSk31qHS-8 z1G2%33>FO6@XD6KvZgKSxzP~c5KdO$g(3ON0b&i-8m!x*h#6#te$`>xijju?XuSBI zQilG6OvD@J8itfbl$5;Uz%n*p!zd3cagP>;iCbS2-%`sk_Z)26;h<q&Cwza!49idA zdn0edisQ)jE%rF@$Q8qC7pV4Qcf%TC3;LeXhK=K{66<u|u<PheqWB_)TnZ&heP!5N zbP(~u>kNC1wecEaZ^QojBZ-eYVA%h=74hG|-H?}4gV?}2hTk$b64lvk_-&<xH4TRg zA&kDJ84jnMLmaQSBR|{RaQNy*oPWe{%)2V_eKidio<zWBW*P3L`r<k1dBX!Y3|xk; zF+5SX2XXN>JpUa6#NIc&IW0qbQpoVmbvW_)s|@dI_NFRyCEM`cS`A~rbi>D7WWs0R zc4XyB+L3Ex4WDnxiTxI7A(^PjuA0e=8??T4WQElfKqj)1nJh{;FNydo546N@C{;VN zpv;3BXXU&tWvlz+H$@XmqA4Y#t^((&!W#DtH^-Z!tqdax(vm*~Q#b`-$-gcT{e#1U z0)BRWVVvKJLdZyEfl<^GLiB<te_gBfZxv!J+bYV|6ZiPp5=z`E7=Qk{L>>?v{IfH) z6i60|x9>FN$8JRI)M`%o$!2`8jYRx0QwsGEp`v(-%C57M6)XSaVs%iWF*zkE+MJsD zlLcI|U##HHQGb)HrTM37Q^Unflz=<^b*>O<N-+Oy8$Q&S(&)NFtiMTR`yrLSRhre9 z6#HK!D+C*vu(cTIJc;^3Er}HOx0`FiO^Gp4NqsGeaX%Bm4<bZEj~40!F*=Ypma`VZ z$27ZCW@yT6-%cV~v%jij#XSl+oW$5T+G^=z?qKv!O0=dV#s5QT*_m5eY1_YeQ~_#d zUo#aqOM;YtDM;DQoRVruO8l9Cg{VEwPJxI~_!o|CH~L@K8rmnN#FR~pN=>epYU%fP zHS2%)vI{jKbJnaBcNcln7>iXBRUPJ^6rE%WF(;;NSQ=E8H7HF@vCky<t%XwUUR)Oc zhEoQPN}7cpepsbI(}bj+7Gv46#_)`UsHFJRti~-0Z#dE7AuH+uAGX*XUy4H`E;Yj( zl2H<~O4W3Bb_%zeQmn=ROSIKw#g=`1eC!u*4GwP3o@NPCBeS|sox_5&zD_MKgXK1q zomNTa7Vs~sGs4{P<*ZiuZrP2C$=vGw5Up@fVjokyCB~Rwwwhv0R+F)hL$}hV^<jag zXlqhRMsSiT#++i0^U&<7tGIjCsdL4$+T=TBJ;*Fjvq;GIYm-f|OJbbSoRX51QrGBN z^*^oBgd(y{_qlWSOE;N|yInYJJ_JHq;hiz~D<!4Gti}<p6@N$;4bL$rTJ7=nGtru4 zop@g|D`iH}thJ96S%!SIv82B#F)_(%j7~9|tY*k#j7>^0CZ$=E)2tA$+J^NrM#xx9 zR_)oHvp?PA1zC}-IkOANCCN8zoNe}CwX-Jdb7#G?s_iSMFV;BTVoJ5I;O*TzD|TP` ztatm0;KwEVN)|5sj~~-5i7`p(76_d6b#D<??b|8^_LtJT|Kr3Be*1l^F`uj#i=49t zy;Wv;ybZ)X|N7?a0=1MUPpU>0e%P#7R^zvBSuftWWu?C9ZYWdEvuZh`CDkZx)MU)M z`KDY}&$qi+=(lBxHE(bCrx-Y8I$YKJTh{#dbv^#MlEW|B+qaTxL}rz4$x2JhM)yO! z8{xK6w8L3{h*t3X64s<7V`_pa-X7=5uwYA63JQnagQ5^6j$H4EYa{tkZ`fN(f`3`x zl)bkJb9Rrlr@2(*oF4euh?7kA_(;tzc7wUw%K7xR{_u}f)Cq)$u?MVVNsLZPNx=bQ zf+@}tE&1U;r3m;xlLEJt;#&$$6ZV`+vGfU|q##gDlv44>#!LN75E#YW*BqT@HATf| zuahxnTciK$yZ$Fl8~?)%|BK=S$n*b9^RuQi_v}KoIQo?TaF_HH%a2WMDDvKivB6nE z`F+0!9;=ddG{2G*N7XjG%kL<6ACH8VWRGd7U`Q!WvbIzsUex4nwiGB?vanQF;(n+) z4yXL}i{u=V&nCeHu`q<=dli&0PpV3l>{rFxuTT8GIF9`@a+;f@C@~vT&2b6HB*s*G za<$kT!Gm(1Y)*;KFd`wwC7NT5<&$D#Q_WUmmA;-;D>;tZFY~Nc;olu969qxa+s1Eb zh3t~Ae#^bU);N-cBhv8%{PCvd*agy^&Aw4@YKt#Y0f@K9l@X_!?MgAi=cMB)_Qg!t zyb(eCjkw{sRL!N}=wTPY?x#N-vzAFB192&)1Y-}gl*NtMcuEEw6S*`d)tGEbwK^NE zJ<K>BBT)zGW30vDudH3RkDL{?{ci|T*#xya0yGi)<{tw5<o@QrX*heAj44=(LzeI1 zD5V~UN|GGa4GQ?*kh9*u$SDPJLb5f(h{^$_75kyJp9pOaa@R4Cs~e2e1Aiqikj&FJ zyJ$gPip6AqEiNlQ`KycV`zeXYDhUu>O7c~Ke$)W}{?lz6o4cj<NVTRU#`HDD*-Kdp zZf;7nOOTkB5CyBka^KVod2u=p8_T2M`87Zg{=2(+&_uY9Lw^pxje|o;R4|p2AyT5m zNwU0d6wTK9b0tc>OLpB0T$}a$T8$3X>>iYyWI+U3lZ?I7%<w14ZIa{D;w*`FDq*y9 z38^H-CZ#3D{LPr(sz8mud9dWU@aAc|xqD~Hw;O|h1^w{gBJf7DJ*i{IX^G~($#5e? zXX7S8|GsRCe_s|0+KUvKv-h6lE?HkA1Y1+I4S@*2e=y7+cP#nOJN8OUN>4O44G#P} zH~MEasrb{|_WFKfsMCmk$L^@oU0m&*R)HV4NlY?EC&k#kC#>54u#`kH|6V>3{yzkF z`TL6B-C?SQb#?xyUhFZH9p)r+&VDnUxtJW8sUOx&#UIe;A1ju!uZS3sh?B_}V~LG5 zr%0*uTkn%(Z=e3DjKF{F;K#jOv(g*rYkz0wQW|_K^)mnSt<u5RjoHZ}D<o@60a=X~ zJ7?!LVFfgQ;|AFmWz4&fl()<h6_SLN95Ov6DKRcvDQCs;|9XF9%&dZMU9(J|U9z;V z3%eHmevN}ZrS>qTm}9aAzjL2@h%IIwS@WK`mJR<_R-}xZ_BZ7ew0tAasi+sG?A0<> zi1}rO<-2A#IL(V>8Iuj!ep|SztkVyQ@?QeNN4n5gYIdZ2VWj_5`2Sk$N2%XZp0ira zX2ljQu;G8HH25_IZvX#Bq4BNpFLg#D2>)Z6chI7a|KiiB(7?AA0K0Kyb*aq#e<_4j zzE_{`ZN#?<gbL`IibVDwD&XMkNdhY1zw0c<uFHRo#_!TfT;>0L(XRhp)^8;{)ytY9 z^;Q2DD((DlDwVkP|2Dhu`7Y?cO7>q=D(m^J`E!+Awb}PPfY0_cooy`5+@SAo+~}Lf zI%?E+P9+ryN5TB7E2{9f((o^y=wLijyDyc*e=mmAks{z-Qf#C{Nf;hvC*9`)YV=R! z!)em(|CxkS9kScYy+rzcCSd8m3HV)Y|5dW=OCpPOu82Y<4WRz&ftqGFUd~Dta<ykS zV>B`rx^#1jCDm$)PTewC!EUQqrR+x4nOn9&&q`=?ZOjQ0>y3_2%KoZh?pezEQQ4xF zIb~@YJj^~&kU5P!>%_L4b>f;0aS|<XFwC~7k>N-d9qo#dsCg{@M&nn>xznXgXeVCM z=R2t2(zL~qy1s`-D2}Aze5r4eD!lY-JidWupw_#!cLd8F`*BJ6Rx0(Q8q{qY9Bzy@ zr&ukqmT0MY|4Vyd=-6~(95_HsnmsO1k<4*PR*QW^QYt%a19#bS?EvpzvEgewt*UD` zSO&z9#tIVMYKM(UCY1WgWC$mXj2s!}uMCV<FZ+3I?pDh2gM-|E-`hW?XxV%BbJy(c zb@9F-npq?0i!^qU?j<>O%D4MEXuXuhq=F*-7KU@Ao>n^B2#I2G^jnd^CvO~2hQhny z-z2PIp}s%Vli*pkE~ZJTR&#=}9hhH&DY-{diaE8N5%tS43g~09#M@J_R1H%dQ$486 zl$;zdX%wAus*kaCyxEj$Hb$jc;$w_qR%5!w+QaA_i*ZR>irL$e9NjHBDb><9``72Z z$d<_Gd>u2?{h?C3F0y;?<!;%gKUs-_1tg(*nL!58{l}y9Zh8KK@2-)($3-T$6|n0% z1-w$)JB<BfFN)|M=ICB#J4tlwon|pbOH)-#lqKF`&A^0N>bdNbgJSTM?~S5k6!5d< URB4GnS+MZGtvCuqj5GHC0POc^C;$Ke delta 15281 zcmb802UHYUx9|5k-BsOPoeUs?fT*AZ!30LcKu|CTP|QR{5tJaHVvm9mjG(9(#(+5^ zV#I_2%!=7DV@{)()BQI+-?#4f-hJz?x7IMf>guXGr}o+Tv`@Zh_MFqqvoW}zCL(9z zm*0af#H-#VlD8+;>JP93xEAaPz6HIBwXP2OfTKZQVr?3Oe&8&y6SxiR3|<EP!B1dM zVr|R8Uc|gqU~jN5*oO?vD;WoUabg)52p$20h_$l<`+;6ye=rmb2B(4X#2SAF6Np=6 zg6YJX6oB`L+dU@|+7LB$`iFBX$@<5b7&#d1K~!y`kp|+;$K&7#@lLr!;xA$?o)RhA z5^FgKOaP~Y+lftHL*(c|Z1gP%3Il}V4UEh%fIWx>;kb#8*c1hkk5Ph<tS{*0O4Qk% zcy$H_6HRIfP9|PEi^$*LP274TQNTg)B3Mjh{%0k*^%$bAKE!P&fLY)rqMm(-H}E0q z)tkuPhNw3NPxB?}dkQa7izx6AxEef3Y+^5>{=12{!F>bbh<ihV1BVe;JRur{>;18m zhQZ0inkNzsJr0q4tt1afBT5-gJbW(1x}PX)5wS815*bT;aSP&iHxNI39B({|<kNGB z;tyAno2y7ZdnR$S>m<)AAYS7v$rssUkS^drEL9_tFK$S@rZvgerQk)Q$Y4C+)@CGM zUq*B#qmsNVo#dM{ao&&QTUy}(g(TnOOZ;{`c$c`%5|S5V+3L+B`2{&1bhnbc_E3^v zgv9I|Nq&XEAd+93O{{4>6O#oKCrmPNN)rRgZ+PIsLnMC%O@7h3lC0l>N^*O=0nYQ= z=Sltv*VV6O;@*)Y$S+_iG$d$h6Q$21!4Auk+K>d7GUAOqN$_k(yy+S+5YK&HN#67v zxQckQFcLa@;Ce$I30)sy%{r101Q9zd0`rLVxky4}5z+XlO0xbrmE<kXkTCozv1A_- zqM@{{Qb~w|$Xi>Jkg*+W{l&!7b4@I{N<t<igryJ`pCA^TTS@NKmV{-Hl%d@z5>`Sf z+K(V%m4F#tBVjW>ceEv88`fz081NUkjf5SLfcH-l_QBL_%waSU&}J10#Td9#go!1% z&-l4CoP@K-hzGcmZ~@BJ=^cqR1{3d6pTuR*f&LjJZl6d7K5!g~SR+2@35hUWK6oW5 z8h0T+Ob4z7{Ye3d@Q`3qY^fkVLP?6fP_C#!q#wD8Snp$0Wzu}&3Gb-t5F`6hwfS&n z*Sx5@99loMfU4gvCuUtpHTEPx^B<7)l2gRS&LZb^DKMYQtBnW5uT&-HYq04V$H>{Z z=C>@!#qR{sb3M6q#lW|G$i=uMWBQRx29(dLI=CH5tF0uzGKX9i8_#=#xNpoU6EilD zi&3&Oewz4vDY-yGbfq_FfT*tAA(vC%aHD}*%!QrnW>U-3I^u!ns7<wP#9wx$wg;f~ z9ePsxOVx=@y++=xR}fP)A)nphM1!A`UyM63voh+mC>v(E7%V0-J4Bru!Ib$`>YUUH z=P#3g1DLC!2KlFy6W{Zc0t_xwh+A1uK=Xw}UYAXL!79o6`Bsu!&7pv>P+}=tsmnaP znXDRhRby#v{iy2ztg-D{>Y9f8tp`xo?~{rC7)ISV{7F(L>gJJ7)Gn5~MdTCT>rCA< z4iHW53>FcuqbEc6!&uuot*OUE1dv+ysHdMV(aZkSYpRO4V@>My;TX}B8`OIilrU{P z_1-BX7S^45ADW1@52D^bD{#Jm`m`JZ*S(zjmV6-YvD?JGFDS6x5aMrlQQ+NFqNyz? zsL4TMsc$GK6%H(Qw1I-A9V6!9LP4|gU?#mP$y+|4pv;9ZFEa|7_cv}FK|!D3fLiUN zewk~CG^45CJOr%~!%Q68qmsN$J?ej|6>-n))W4*dSpQP$e`X2HZZP%7M0r~?3NHSD z=PjY&GYE7RhD-{6ih*CbQt(?ij`kiD{AnK1grhXT<p@46paH`%k@jb3K-v$YX%}c< zWHaKv8X6?dB9^wA1`WpA^J<mkJ-gAMZ--%S$7#qt1f$PiDI~#`_@i_h9wrcrSw~UN zvSEJ5XrxCj>_508jp~&~EPf}Ao&ozFT#sT)mk>{GPjSfzN<+ga(R?AXtT-Cy+>#jV zc--)CVi#>_TspoFT|~)M6NxS@qVdLwMkdhsXgHS0x->q;f%xzYnkdK8C|M=B(u}73 zIDt4)PU++3l7X7`syyJAH`CM?a^kVBG`(ymafcAfXc|WB;b6*iLX`C1Oqm}rk@Zt) zj(b;PL%Y))k8R)zn%CSLTAf169z7;Ddp+e1%!kM&+Tp*Oc$00kqkA3V<1bU;*aUoj zLxo=;k(Y1jXl6YFvCBnNd<!%67)B>*VvPef(CNKvh-H{jNdc0EhAI>DB23)IO}wYA zB&%`TMBDx*{&1i(wGhmNG!qv$rZWq=5sR2f7uCq5XboLH2BmzUr7PbIeTf&}pqpX- zMCTQB*GWcH=Pf;Iw3C?UCU6({9K;*7bp&^V!@&Y@9X*<J7e2oyJ^qO$@FIHR2w&fB z1-<CDA4(lUuM?_bjT_OMS&77c2hscUA;f0vqK}v1Kax`!GaM`+3hK)gx1khf8La9T zxXk=d%yMJ|QB{%EQg=rl;Kyo}tR=d7pIN`JLfj{U*<Sa+n>aALiS>wQWHb9=V~9ls zFo!@`g?t06-`1SiF2<Z6LpkfLW-d8biETc_8eZOw>}N4^4Z~6#C}jq>w=0P3ez0a! z;ZUN_Gtc4pBD5)MXO=*;G>Q4zeI_<9ignJ*Cdw^k0o^Ky9lyo;^$sU~+>8zFa**iE zbvCR6lGQ$17Sg*N(O5{kVg-WDAQtfnZyN8&Mj)2ZfVwPt`gG#7i$$+!N_^y1gXv(} zEf)P}Q({*u*ysTz2*a*y^mAmg!^7Cv={dyi3oL&2X=2w}v2k-=VW2rIY0nU%@5@>8 zz7k@;WNd0D_=zd2Smu$b$PuTqIZL3-G0oXr;SGY27hBRAO4_F*TQaf_vH9;<?w@w> zn1-2b)y4+IUi4tAF7zXQp+4Ktv<mz|B-`8#QR`*_+d6eP(f%E5>q{S^Rw=Atw;PgA z1KZOZYyVir_Jl&TYd^9*(cqdBY|m&TUD=)(aP>mAC*Jt|V7AW_4k^2c9fp-q^9}4s zTMpf*naN6in-d#<hMj+oR5{+7-I$0AeCD!S#--R5z@AL*K(zZYd$X&UXw@+GAu*0< z`%CtDdO94975jYWD{(%8{T!K2<gu8`Iu{Y!fjo1bJMo!HuG$N;w4A}M@AwdVp2}-i zL-^ep!yO#XBL3IA%AKrjiBtvLsR)^H(G1?GEtJl08*g&Mp6GWNZ}adx@wnRDbM!`H zcg=a*=>^1gpX8m}V&J4XeAo+fBDaT?WcJVah`49O&iL_>Eil13t~`1;Ua;X%9-V^l zysrk2&PH;W62-?(dW`&kWGx=I5L(Kt`M87>;u?Pw4=(2uTdgLxsSTgA9ut}z%jY)v ziD2`LXV)zv{xFee2WAuNdWtU!xlgQ1DEI)}1U>}cgLw0<t@)CE^NDr#0vCXnz${|^ zmY@L-@DIVkLU1F9RNMb=5K0%&3S10M1`$L8O8An=$P<!8z8b-b`3~l*-~A$L-<Gct zZHd1Q;A@7O5$PWAyj@NNCFh%rVLijw#AjFd*7>;KGLh$}!6g@u=erGQ2qKfq_?~`v zPzM>`V~m2AuUC>^>A?$o!+cuq;)TX&H}n<X{~4bro#zK9xk34g_@UZGL|PdyngYAl zhE<Xmeda~Wz7zL4$PeRtE)M30eapeE{0Oe&;%9yg0gJD`!41U|<`6Gg!%ww^$J0FI zw~t#A@794o?7EwnO#pu~QV$p1mVcPCmZ(vriI3Y<l3BZ$=rFdDoa*t9H&B>9KgU15 zUPW}_KL7Zx8_}~xGNE|{@y5Sp!c@eRM<-=fZ#^Ksv(O+jTY-aKTV+;1FeCp5vRY#? z@XTbHbrQ6_<3*XR2uJkCIa%$z;ZQnXncWLyOzJ1HIv4Q3%WY)!_pTuRR3UTRixkUa ztIX*tmZI|@nX@B;lwSgfCGPkX#1ebg2eHK75#XPoVJ!}j#d<#ip=>^NK?EP45O6K{ zCy2H7xd*Ppn%jcw!Id)SMwme7<uaEH6|rIUWDUDRv<r^N+9+X$KX%C4+CXA0U&*}A zW9iQ4$=XeWIcCk4`Plpg3Fu{AqHvv|=)J7RW+Vzuv9f{RPY_9e$_9m*5%2j)HfRHs z=TZyVpwHQ;bneK8-ABRrbd@aZS{lM=j4ZtTBmBZbS>&T);?JUFqZ4r70vFksMtzCm zl4N6RGvbLeW%1*&_NlXE3HK6-_n0Y5bSyw6l`czM9f9~C=q^k32`4ryQ<gd^gm~X= zvOn$)fv5W|n|ufZOf8koxGy8ttcGmn$!f$lrpq#H-VlpCE6eD0m)PU}ve{QA5x<`y zn=exmAJ9dXqeW60JWjUaSsC#Yqhxs<@ccRLWE=0HDN$A=+g@T%bnuyM_kGwu8Omk* z-oV8k4v`()VL`m<7}>$!>xu5i$&Sb|@YEi%qnhSOxl&}uv1Yt;ne0R&bfxKM+2yHl z#ZJFv*JdF}wYHF5|2vTQzS*+-Hw7Z^eA&aLsC@1=l0A}Qh&exzJ^F~)@~DdJal<mA z4NGKCYa5_c+a=k{tG|g2be6qphc&+vC#$H2pmH!o_9+3P?B7UEUpo*V=P4J}lZY0q zmn&8vzE4>#H_LTLPoRptW|jNMmY>S4UPH-t43^jLjI~{VL++Am)QtslHzlm>FE@Fk zykea1Aa}o0hj`t;<sOFgT3FjP@^&6h#JU;e-f?oc$RxRcav!3aRpec*ZW6C0llM$X zLQ`U)ymz@5@i(dR;9FSBv-9LbV+)8KO_hgD@J6Cy1^R#ipf5OH9$pp$iB!lV;?sz= zJ|&MF<&5C<Q9jDY3t>M?ZixPg8~$u5kJ*fHnY}?C8y1e_u$DY+%n>Nj3;B#>q|1{c z<eAgWiCJ06=iD~d34(mVR-|Umr{s%vcPGmFAYXI<#ie|te6c_B`+ky%Gd(NGYo0do z)?e}^j=NC61j=(KPeOLw-5}512_^cJD_<$|C+>0>3<iIKQN$az0TB}#rhqevW5AWN zCHP(dH-g^aK5#Pl9N%{Vzk)O6E7ASpuCKvh;%+Wr6c`20#PdFac#f-~84fn$U@V9S zxo!vXfQE(gRf#^xfG){bw_8ATV1|74UvRb6tmW%`AgS9`<?Fhl17==dzApAS!nd=0 z!y%ZfI#s@<Azb*lY9?MeRY`9B)x@$A`IgOt(bgGZqM_X;`L^<9#6Av@?|u%Y2@jR; zD@Eebw9LfV4)Xn~$3z9iChj%JOBTcN*nW{;$aN$>+E#ukvNswPHu7uEumagq`TZ$n zFw2kf2Q_s>tIg!)=UO4Rw3R>Wj(VX^EQrF!K0^L{p(X5p{1W-g#ivjdewM%L1v|F? zB7f5t4Z|Kr_9E8P5$p|SfJmKs9suFddcFh$iS?=lqF>mn3y6MUuL&Ufg}pX|!QgHA zXMgyMm%HU(`oR9vgXO=1rb0(v$$v*0+h=2x0-x3q4k1YpmKi-=tRU_{0kX4-AW0bD z^dLc+0wtW%M5w+6o~*vFU}fHm_>n@v>fjWj9p!@6H8`y7#zL)cu<JE{3boh5!)=HW zYVSduU-wY3n;K2r>AO&GF0AT&nNY861F_8Kf_)9cBO)pm>Sw^N(^P`f>83=-4-3u_ zki@!`g4_BOB%Ln>kMfgfD&+|+=fl-DwiH@!`VDpxS{}Sa{AdTE&5lEOGY7$|3D&+r zbD>?`HAD}72tGD9V74^{zYE7veisUzzo1dMVW-gb_feQ*3!$6g4V20Jv(Vj`dbJ%a z^qA0|xaAcgC~G1fSS0j+(}~zgYhkcE%&u-zVesJ<L~H-ymit14`*&o+--L+fZHV=C z6^8E^LcC=&VU)2=*Q$dM(+zFBg7HFJ=UYVeZG@zT+lc1G3rQ)dXz5fH4CBpk!_sVF zQtoc}_@_cf&$~qPI|>;yx8s2~g-nkGl+!6frm+<>p|g;A5T4BQu`qulma5t|Axl|~ ziM|&WwN#<J_7)a*av+-dN?39Oj>)1($epp6c)JiGcSA8G!-QonYw>x$u)-Ef?U-s1 z)-*3BHod8^cGw@p!oLV>&j%A79WQK}iDa?CDPc<+3@}|OZ1H+beBd)-O8`D!e<y59 zMpiuCQ`pgJ5X$lhVaJT4#5=wacFc{(=Ox0fAPhKgjZknG6RH{^?3r<u_{KBB-b`45 z-ycGehY#ulL%wj#;|%c@PQpoVC{eDDaC#IbbmuSOOc7?dH9;t|gyZ<*o^We`7x7ms zh1*dOo&N;k_V^5<5uJp4`w<ITgbR;k7%=>j@MsE@PqjyQJU0&mZxfzIE+i(k5nkj# zlIbgim#gxKFRKt<yC4P_9CCyo&Cu%&=qLQDgWRs!Dv`N{6F;_06w3cbc05AVl<0`x zSu9rhW{(PUj97hADEfp0Me}!VSlg$fMYDZGg?B`Y^ykFB>=P|7AvR1HCfYpMjSlxD z(Y9MPD7CX#=jCCdP2WU^cCaGf4x-chYRLa1bfQZxw0ziU(PbCHZ9*rpp*<W>d79X$ z0(Ls7wb=MCEXj~pV$(_C$YffI?$+?#)gOw@&-EnI?+}|`P-9K?VoTRk(3xSPXRWEk zH)};t8^nmCHO2O|(6s*Rjo4ugB#}}scGT}8o?Bn+bUqaJKXH}Vxm5#LVSlk}tqNo` zUZTl7=8HWh#}V&3U+j4a`9Q`4v3HgovG;nh_gOR~>K_*SL?V12`6>1}f%raPu-G>Z zB0nE1268-S*S1PBc^5J8ZeMu9Q(}-~7!sFsF}U~u@#@FL0q%xq*x@&Ez!}(aEl=<= z7zbVfH-Kf}U2z~YhtKyG2OGm@$^&soY*TbXFN#AZq0Wl35r_7~bzK&UL&w1N#*Y%i zmlR;n;Hwxp{3d+;eR1SEW7|Gb9M!7`;oDq{v3JM)ZN*r_?e4_O?}}so#+n4>iesPE zMX_03oFJkRQNyB=Y+{<2+6vLCpqiMPI1l!{T1-s>h4W(S9(b~t_u{1UPmy@+7bj2M zL2UU-aoVzT#P+#~(=OW*e=$XzQL&nM#7c3F(T{{Z6z9cZ;*um9<~>D@S2#q>sR9>_ z4VcA)kX-ifDCUk^gAC`Dn46YBthu|1V~WI8+nNzYR*367VGY5@#0>|R5bLHFH!ZKg z+OHC~jDLgH$`^6V(op1rAI0rysHz8U6$^r)jMtWng?}YrpD4}5rF9IZgP$ehk)axx z;aBlk2nvzuMdGo)&ZDI|NGz^dhRW!@c<MzuQI{C8#BV3j;}Ws7#u98mIEbaIVWy2I zRgyJWE0&&wBWs`&OP_{gKWL?i<pGssHYZJVyklY`!(*}Zc`@<X`^2*zt%x?>7tgkT zgBos%c(Ez6*g?_arP&Z|+C}l&NaN@A;tdx|q7~D{8^50u9os10>W--B=qcXHSW9ft z9Pv)61F?c6@!oA%!yzs{Dkvfv)mAKTf^iDpiZ4gOBX+qYzD)Q9`w#mjz6!xXVI%R? z0Yp3X2=Udc-st(95MMhrAbu)IeB<ekw)sHuP55MD+M(jxrFhVq9pbMCBZxWtQqY*w z==beXu%vCoYPu@qix7-X<SUc~#Yo|{D>P3b@}3_Rx?Pw^r$R-wh7Q=UIHRbRWDfhE zl&G*gbc|Tw28GSYk7yc&E9|Duhocy(XnY8382MSz^pzEqCP2}`1D@}+LeXLrQnpJu zik3BOiC@zyS~o-Rsy|ubb;+5Sdm}}=Hu%2fcZK)jKs2ig6@IEa#7c4%0gd6{TGmi> z>DhqT+h+=xIr@KX`r_ac_URrgde6LzMqwRA;6!A_HGe4vZK*<RjFn<=Be+hRGm4P7 z6U4p+C?cD{qgifHM8Aipv^uUB?Q4u`R}?WVVMVJ-6%#A(i&ms24ZwtED^i!*!&*`l zlc%*Owqk-JJ$nekaDZZF4+GZrtd}BFW{w=sMv-{|b$^<>V%`8W3euu0$=j?@EMH_s zY}HxC%AGz$%a<uue}gVWJW{OrVo!9$OtJpOc|^_YiXEL^qkp(rv16D-RQtAKXLV2H zj5`$hd#@1NvtO~hizk}WPKw<J5#FmiD~=foVQ#Aaiep9|h*F#!1Q)yTPsPdW`NSq3 zS6u17mZ({QqU^Yi$R=HJ)f;QyZ>r*IBs^fv&Wh`))ey&@D{ic)ih+kKZbf7vEC(tc zWkF&cmMI>6FM!9hQoKCii?F;=@%CFfv1e|Icg1+2Jq;9wuQ#wpwhG0s@T<fY+)`@L zLT4Y$lvNj;M@2J1X`Y09VDJcKjaLXdiTTQUhF!#TnaX-EFd<uCrNe?E;!nCM8(d|? zs;*PI<VGQu{8GB?ML{zxSlO^UCTQ_Q>Dn<JrP?&5TQJOdz(b|m=Q+fmYYfW91G7=z z&sBPc8P`yuY@7BFyWrzYEXq`RHE~02cuUz1=jm#SiFY*0_5oM|tIkUA1b^Ibr}T}4 zWVTo;eb>YgEi701eM9i_%U5=KxRBUWm9p~|c*MO^l>Tpjpnz$q?7qJzad*RQW%oz$ zbeC+DJ)`y^*IS?ra(F|OGuFh#Ka~9gv6e~WmBA4qL=nA|L%LN*{eKsP2>qOtL+4}> zD{ZM9Ru1J;&ryboKE%DPl%YcewC}4ZNBE;Im=d9kdSOqj)>!3e55mALl?ewRIm48h z%H$>ppOzhz<DC&y%#SH2{d$HL?0IFSw&p%nPT2sRsH0QP3jBk3jYwt2mYZOXa*p#< zqHYJ23mGz{a7X3BFi2`yJ!S58cVe{<E7y$1z?VBH*A-yRkKI;osE(}J(O0=?xg~LZ zUL_6u&~N3I&<fbUO1bL-X1;r@a_^=U@N`bf{Z&R2%{r_+Pz}-X^koxEYbp;qAXXd{ zln1wBEn7z@4`spudA3#_3B5$v*i#nYh(gVHQ+di8wP0|WvP6WAIXEgycjMKccUP9~ zxr#leManZZV_^TTvC6Y0u<J>g%JU2Zhh!@+tg<J*ezo$-5Eap%Ta~x7p_Flbm3PsI zB)_}LM?sH?HHuU|=`)1*+>XkpuVF0-`;_neFu;q=%J)`ZiM`P)-yaAj=Jr_mVN40p z%38{=c}=kG)=T-#0d2jzCzRjn8}P=}9hE=6LWz<}l|S2V#8!KhO8yvc(xj?NNQHer zt)^0rjUZYwR;9WHbNv1Z%p*48fJ#*nPQ1@NmHJ0Hx?LWs>aSsD59e2sSyiaadtky{ zYN=|7u!_b>D(enm$fCcftZ!8i@4ib_*DxxExa^FoUOf~BMK@J053^C3XjRSZ-Vz%% zQq^p!2a?A!m1mb<5b1K2uiH+vR9C1vy+)XQ8>Z?_mS|qzPz{*mi=?%hYM|E=Bph{B zgV(Jk_9|5sIu9=VOsFdK;4lQW`l`^PVQ365RSge(PjoXvWf)O}nRR=jiVms3j^%3; zzw1=dk$)o{XrmfC9tA{aJ5{_Z%(R_KH7*kqT-;7I4y78)*{T|M(D?b1Dk<9dxt1z< ztS#|-WvWW$U3OeGWg?bVoTZvo7=U~tQk9u-1rnI3%De^%<n%PC=BV6|0X0=EOc_S3 z^EB0>=TqP?f>kT?;CQ0Ps#e}ALn4u-TAg2v#Nm;NzYeSNeuhK&9;()*rxWizMz!AP znAlO(#>+FYFZf2aW&2dre0x<}y*^-n;Dl=L6X?M95ECD5SM87CM7Io+RQq>e0uh5% z2d_g*r(38F_k+?LX`?E(e@>L2uR5_K0xgt2s?uN=;#C@{&Y(#}7F|_Wwbh7q8UVr{ zbjnj*KMUnkt5vu8dSVBrsQ#j>#LpR2uQRa}=9B;7Q`H;aVwiag)!z;X?}jrUR3FFr z6FcFp`g{PDiQ9VBx4oB<6^E+6dy9C39;zQr9f)tgqxzZTL+r^6)$d}w$&oZk{%kBN z9XClB4c#ccAc-1$KP^lWe;^NV=8__HHwqJ(Bwd84gZfF;9TDvE+el`wt%>XhN*4Ba zQU5RMCpB<9PNb}5;+?0G<DhoL#%-3IBB5Mer$|l(h}$EwCFe%vnE6b}`NSMzt=da& zUa*GSTylE=JAc5Wrt4t^%{xkMX5S<_xk_qV^D+EKU8&tp_z8U{$$R{B#Fj-;XO%he zZNH?><HC{u_c|&C%&beSN`=(xHNLoTT<TS^k=WJ=Qt#W_kamBO`lhH*8FiQX{(`;N zXeI@YbVn?(kb;fB=W$X<gA!Jtn`JExo{x!Y21rBdL&S})O2c*vsFqJwl6`w8h05W0 zt}l_o9LrINjFQ3%4KSOSAyW8=1fmwNq=;qcgrqc=A~sCGT0fK`e;}h7pCS$S2qYFe zO&XqZi1@HSqy*2t$N_ayA|}GMIVK)jA|)d=W3ragqz~CdTe?c=TVhbuW=QE<?NQ9m zkutWP$1Yn<Y5u@s?6kN^iw*wEP}xXQ?r6MG-7IODEhpa0Sz5NmjHvu>B{^#&t&A)n zid`hF9Qil#%#qTcUEl}mtdiClS=T|@5Kw}6|5DmyutyNGH1VK=w8dczwsuBJTN+Nq z{g<R|Uf+mZCP=%U;5z%-l3|}$9I;#drG372hz>QA4#mWwjz26NibZ&B`%5}JOpc(k zS~_0FiB<a~73&@$6&q$^;ZEsf^^P#t9n#6-s)!*SL0Cm#qI7B;mY`#%RO*6gH?SpW zha@*eDvdV7`2*4!i|*L&Yi*FuWMhqHx=9y%?j?Tnj&!+S8J41lRKD4t`2LMj`BfAg z%iBv&O5dPG`$>9w!W`Rj4WwrWTO$YTAieZcA<K1^UPgjr|B~MBgc7QcN$++-claym zv-@nM^?uTqQbfn;ccic1>k=PwR{A*|eS&cYgY>(dvA%DwmWOsCX3(jHoL1OKc%xP= z##;6>s8yd)7d#7AOLd~KhQHKO97Jv7qLy;AQO7%})z+9$+%dI!F3k9CfLi?!FYwnR zb+x}%5wAB#ZMGWM`7}`1(RdNfc2d`KO~7{i9(9B2Q(*riW~iN<vxtJPt6ern5esow zHy(eS__Ueo#?!hZNsLjqZI4F5{(<Ut-fM{;&r`QIzM<r+?vVSHc>HE{M<={#${4lx zhd`nk6V+X|nPH>RQr$HJ_uIZycl`vHd@EkvEo=~~WE*vltF?(G=BfK!#P2_7bAdYO zx;fF#k?H|@B%vM;)Pu24Po8e-!4ILeZUfa}$FKyv-9MbAj>OJ4i&3ki&FVo%;?>cM z646rWrjE^nnchxT$KS_hbj59T(%81Bj_0dWyb+XoR8yz+%0r{$wmLO<CE;fgYQzY{ z|6H{?T?aEU3{_9-Ex-kTRnJ=a0HV2~&QPu;_E(lV!#^3((L$Z^4KZQf9d%}BOnA&J z_3S$uXt$Mm-bIMI?k4qodw9Zxqv{22?J=Qpb#9fZP`2Lc<$MN;RZ_39fKpEWtX^Zh z&w_yl99;QYd4gY+tMkT(qo!-2&bx*;?>$Mq;h+aZ&DERJ?_q!_^_H<Mkn5dLZ@(D; z<tbM0#!qwj!&mA94PZSN7po5^xDl(@Kz&3)*84}c`q(Jwg7$bN`C%XRvH9?*&o-)$ z9pl7@cT}G;V55PeKB!N3gR&(ZQI~dylAN$qpJ{|5vBoF$*}@m7V9L~I_kVzuB&e@6 zSU~Kai@MC!2d*_yea)#l_IR(Vuib!lpB}EhVQr7yvoGqKh0qbrcJ(cXe4;7?)VDi9 zVwYa2Z{s{0%hh+9V*+8F)P{$cAy;%#KR$;1eb*`V6Lx}lV3PWUQwp&gI`yl*UeF0= z^@o+Pdu=Tf4_T=zieV+)<JBJ<qkGo;riSd{H@wDb`1<E)UN6wdzPqFP-Kvp$d?nWY zqDJ@(-RRI&Bl>T|Z%E&1#DXO_Kg^&}X8NP~oTgE4z!x13YSjDjMaPC3?Gy)SvxP=4 zz+tT2uc`J4HDQZnO^q~UF1NR7EcS+>^VvgVb6bbr?*ol(g&BT`kfE{L1|4BmnmTF^ zyy0q1-R=&cM&nlU2s<i^HO(H_5@mMLc$}{TM`ie=X*~^ZvhRY%>jEB}^T5RXa1#sS zOx){gVoCK%G7U3v!1YS<{OX$aS7xC^Yp3aOUx)I#r^YvO1@XIAG+m6@b4j3yrMa3e z3l8C@8n-pwLLWlOJCLTwGKhTWDoyX8ImmE4LD+NDO--L8vx%jy*Yu0sg`jg*6KrhN zygH^CXi<iu^@L{N!d&7P+i8XrBRHMgtBE{siC*z}%?LzInyk@`Y!OQob51j66~cSX zyPCvzh#mDhXwnzxh~>@J%qUuo`ak%mCi4>V`E5@%vxoM9vZyt4x?&Bt*=yz<>Pyt{ znThw_RFc*9G|}abW<l<1wBMsNS<i~GH~glOtbU3no83VLbV`#g1BZjg-x9kNX|hki zMNdAYSu`82ypvqB_+>uq|KkHqZrBo{dPg<OeqaKuK(k!=hG_0M&2p!3Vyalp%JrDY z&F7lDZxO`iCTcd$R1iOJso8SWjmUMRiR%JPe4wf%tC?kD-6kgfRBN_8TuuB)6U{cS z&&20d(`;{KfPHt_s@X9OR?xSJW^afb*=kMAUIRp$|4g%wM-XS{H3wKc9N<UI$>lqV z_6*dVt-$%JzcuG<i{Oy7nsaxctTkq8E>C%bZTU#e^-q(DhCk5U`FIL-g0<#>B{Cw1 zQ<_I!3yH5BqInja4OhQO^U`44(WvdH`7p5pzkE2Z`C1Y~d{H=d^igc~t5Zpy{7frP zzl!TVXcaRA;!6%_wJj^~E0#`L?cz14XjW_Wc2UHZw$N7lgaMB^X>0tQO<Z|YTND0( zOGmU;CydWqtF3(m8PvjLZN0W=bfnMK8XWy`L06`A@!C&hbx7-$FqQbIx?1;1MMy-R zXq#7ehuweEwp@o9cU-1zosS6yebu%p!S`jhTJO1q*rNHS^&5`(uRWseavj#B&(iix zC_s&8q3!dkA#`D;Hu4!HCeP7E`FZ0-_G_cIF2tVj27@;029zh+x{};(hIZtYZNx@K zYe%<wjPuj9F>4{x7iw)HZA0fXOq*CL!7A!$6Mr1Vmh3a_xcYf$P_EJ@8NZib)h4AP zN(v3M6Fcl8b~s);aUjmW`>vgA?40`hXwyztpp?6;oqm1|k*^_8JI5I!O-s_w3D}4t z@uW6usS|oV^|aZOlZnqy(B>Q;f|}1qyR^$=Bo1NPWdkP>olVuQn1zY=|E^tg5J~8{ z0PUuV-o!5*)b0^5aFuB79#`}Q_OI0zj)KFPy+V651v(aARa;zl9sI)_?WxOwM272* z+Ota`+EW{}7fQ?UyT0|>d!e}DHPhZN#)FghXdl<Vi#LeVK2630vg>GH9z-k{|5N+w zDhd*P8|}LUDDjJt+IQdj5FZ<<{bExD(cja4DZPv=c!c)1Q8$)^>FDYl{1&y3j?bTu z-<XBz#H6+O{r`+0onC>==j$w8mE|xqMNJd$#Outa-$weqQda|{<UTr!v-nwlMMqt& z;l}Ic>TLb~Ce}MmSGzXMvizs6_J;_fk`P_JN0~@w@9UhWZ${#=LFc^gJ#x%4o!hho z<e2MpjZXRE=XpPkg#Ggax)y(<;_>RCYgy|Twp6a@TJ8sHN9o$=%87ae>jJLoQ1@Hu z0v<YG=i-~LyA1}+`&-xjE|hG4h^|MEY@!<{bU_}EU{)h_{T}{8K{7_yzc&(-i@S6K zcZ8$KE$N26EkPo(R2SlQ0`dQ}Zg`l%48L~ys*4(lCD?LLH`zfTTD(R#wI;OHeu-{I z4BBaf2kSDenh^^<t6St+4O_1Bb&DR(B=#;@xAam4_5qW0D@Q(rB-FZ<w_xAr*XmY( z!;*|VqucK21)Zs>+tnGmv&vnUKO>y@$xz+y&v114Ojl^wfg*75HQoNTa^&;nx&z%; zpgA-{cVHVjltbclhwrsUI31)rwmc7gz#6*JC&!><U3KT>0x@Bc?y6%MlrT$o^|2Rp z=DP026?^>Ci~YJgaga<|JKbN4Ac?Rn-J>{jnDcC1xouy(2;}MuN87W%&hSLGn|LwT zz03SU>~$;Mx45II`^W3P`<WBPztzi@A($-at5>$DhD60rFYQ6|$>Et^{TfS_7^F9g z_Ce8kS#PmnJ+@|c>8-jn#l)KFt(!xV-52U>V*>n1p1y89CCYGLy~BQY6t{Qv4PDn_ zJ5F!VyN*K?JEze%j&dU2q^Z7fGDN@CMc;VA5#mj~^i7r{&dcuUn-sv#|6ZhTn$#B} zKc)Aqavr*HK;L#Ef{XnLecN4AiI+at`?YW<KI?|wZ#*)i18TkBl;_09tk-uQ4M#PR z>AS3YkCu(750ny!tuzGdgEk_0ob9e3Xe_}Ti}j)Iam0__)rWZq#6@d;*n|Y4VP^V> zW{`-cmVP+MVlU{U(A|PL=%cpxC6YbXN4GnH=vkm2^Xmk$hPU(y`$CC+x$4I^!;)I2 z=_jC);@d*?6DEbA%zvhzTpw0p&<m!6YD4ui>=V$8O3=^STR}W8S--LjYuVRPziJ>p z-|ME|bOE2+%++r`2cO^Sg^ByD_1nxK;-_2m+l4|TrGEO|v+oe=QdNKG%mXwmAL)yz zJJIMJ`lGcb;pe@#^+)Ym5<8QtKkhjl@qgl5{qdW4!<G~D#rQP~iw@JD&fJY364un8 z-U7NW)|b?P*}Pe)FNrI|4$-(u^26Esk~_O`eTDw4YZKx-lJwVJ2O|9r)|bb7U<2~E z{+R_jBV%vsUrYUvp!CzfyNL+|Rn>pIBtrqxUjNxVy%pl{8~x|z=wzI=)qhE7iY8PW z{r4hUqPwY;WHtOv{60_r^C7}>VH)bSzmMm{u3&cg3C&x{@}IXFQ8i!aQHSME==p-> z7xnJinZ3(W=LR#oET^Tlv!>+!!8&KjmO17(TIM2St+PT_*<{I9*(|Ehq*~q~F)^_T zc42W5Aqf$74o&PLW8>^%6BEWHCgk^8HC4t2<vi%bt7pAf>z_5uQ)N-ZFC;2DF)qR` zA=WM_E(-UAM#qMY${(5+Vb7XpwJo*Gx?fUXTdPBKR7iZ~!(3gn%t{@ZTjh8COKmMI z{`+@HQ8D4MNl{_3F<Bw!t+G5zt+I+s?P}KizpqJ%N{EgyUX*Wfrb<&5lr{fXqb%oN zjdgV!I5cTs7Zq<85@Qz?lNI%=0dva<ku#gD^*^g-1^sN6HSgCU=85ZT<9ZuwB`lmo z{8|3%Mxz99vu{_woVit*CG-2|+Qxd@|GXqC=2zXqUYxlxmYnm4j3sAXe5qm$b0j%y zSlC+52FQIUkq<>t1ldst#n5mZjiMho3dh;ulu-FipUSfdI1`I+?8uQEs0rASQYx=- z$~o%D>-d=-<AVnoZ!_K=N1x~(MaVGu?EiHf<C7gICWq;nnQi4LBk`E<${G9*<JAf^ z-e8=jaq|DesQ;E*YopF2#)L(L+d0J8#YcoCM8(E9#yd5%iwFrDVN{~fl!OS=iR7>d zToxG>9bp$AH9n^UW7P*wp{^Js0&ipdvm-bBKNce!-!lZCT&V+vQapvx2#6;NXA`K+ zzvmW@Bhz<AnZ)2bJBZkHjG1S(OR~VfsY|T9%5>K4-!r#~7(FH-#m+4*HasLD#Lcd9 z;q9WMLgPZ>QrvQy>DiE+4OQ7Xn{@KSBS%m){%>5n|1Of49BU1;bo&3Ak?;R&Mh!<t z#m7g*4F8uH?MxHvI|BNQ|Ne7=h5f6u7L2)Pb+~1&vLkQmNrB{=bFC(;tu%`b54Q^& zlbG`zpJ0i&B<E5U<}BCYi=3)enT;%xd~)nG%sj_Z%`}ZnDlqOJ6?CAckXRHXYn11R ze<W*KALHwf&Z%O-%v}F1NymSd-7Y3%bfw>jjkI%UY8M(Y0tRgtfxp<uoSqW1P{cu( z@SLn8ndX+p)sDy0jibcjF9hrCN-&3<o=s%tIaL#xZNE@l9fj*KzkiSB6h9(9Aub^# z^xt9{5fKs|5r>ZvqvMUfC^W(@Bmt_YfN3aubv3OhGa5>`$xw3USLM}nbTyb{ZW=cN zi)&oof8IJrm&oc2_@4&1#n8qT!th2d{@+Jzh^G#%d{3kDB;Y8D#^-om;x)78E>zX1 zkr)$^JO)++!-yCfKO!O~;a{equmA5`|MRBm)&Gy1{&h#riJC0X(hcewg17mXUHqqR zNHvn;V(|k1(vHG$mh6%$YfIbEoCbER+H`Y!R%mX|6}t<Cn|y+Ep(x09vcmcbS)RLM J1|-NC`!6ut#$^Bi diff --git a/res/zec.str b/res/zec.str deleted file mode 100644 index b7160ff..0000000 --- a/res/zec.str +++ /dev/null @@ -1 +0,0 @@ -Zcash \ No newline at end of file diff --git a/res/zec.svgz b/res/zec.svgz deleted file mode 100644 index a39853d7b4b26091f0d9a61896b114e290401586..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1023 zcmV<b0|5LViwFP!000000EJcCZsRr(ea}}2%1eTh6fdGgxwaQ*itQF?QJ~qRz`hi! zMB74T$&eH~Zqa}5kkrkI7wZReE@y^wIi{B%UiYPU)J<E|)yijt`kt<`Ixnj2%76O& z5i8$oyR^#Fvaa;XuWJ9p`exZ4w>O^WL2%VB@@(bry6&(Dg2PKwlDgRjc^2qW?{(F+ z0V6E%CwMl&vqq;~anxD8-`7=ZBdhjy25$1rh(4W8<RmPJB}o!c9&nBUf!lM{rLXuh z6l%N{$|<D*_$K5xQO81`eyCqpKJ}=_C3RoUHI0s0Ly@n1h~vy(gSy=7F3r;}H7@5I zEL>UyV4#D=?>~NY8t7TJ_@i$A?p630K>Anx(ye@dJ(`z!w%F9oKJC`UKHX|l?sw48 zGMF3};O>0TQ&N|<(QW<GWcum`^K4(3py079%JOG(iSGq(k``U5*Z<f{ojkM=^nLVQ z2D3Jo!7v4@<$BXj12S4N%%<(m<yf?xtub(aO|r7Z?B5L(wt$lFZp)(5X@j>-nioL3 z`|tl-1{U0Ba{ixs_dMmBNPqCXvXvhzPE<IW&R}AZBng{P98gI@#0<sXp@!t2o3v`p za#nt4#4_#l9ac<6if~U#5pzQ2z1P&8^@Jd|Sz78l#yJVu{kx1$RnY;3Us~Nf9@0$z zRz0<PqzMeLK1@rmH=9-iji^7_3<76$SvM>HHruF}hcmC6d3^|HoBv8u_O+y&JkwHL zNg9nwm%-(J97_xptYn!rQN*eYeqzA8k#x)L1o$OA>*i11UulSjt8}k>hsOtcZRb32 zK@9V;(szMu8tftMc2h@LnYOS6OUhZJko8x_BLO=_oF_4fScYYkkO)!Cs0fLSaR^ii z#i+W|036V|!@-R%VKM5np&`t{N41AN^tU6X1SgRk&(VHa<(D_xGTkyU=fGwEu2D&m zc^MyM#EG<`DJ&5&Xdr;$(Yc(0930Ky*4#%-1|xmhQ_SH*Xapl1MwFP}3p8y42E`q% zwV?~!<$>pjKKPNv%BJRVOp>s_-pW@;BEK~f&dgMqREo%CCqqV}_{d`lugVS!2D>}L z$O(%+G4o_F^~_Wh5h*??!HAL>^hoXg1&M(q3KSF*U}<CwR<ucxguP=W;2}aL0<at| zrXgXm6**Pl!=@p7FT*01$i%`V6p3SGf`z*dF`x&-ER;k+DG?<+dX7{?nAiy_iAbJ9 z8Sh*p&rzK0gfP(=b(bSsF0$ofs1dnxt!T@|rrgULxx}{I$cnaHVOH<PgrM37CKymP tOc)HvP!^tDGhC4n#nGE#U)@(cdvUhzk%41r{yWz<{{wPec$y9g007!P_#6NL From d7b28c2468c129132d59e439c6071b4bed73f29e Mon Sep 17 00:00:00 2001 From: Syping <schiedelrafael@keppe.org> Date: Sun, 25 Dec 2022 22:11:51 +0100 Subject: [PATCH 4/6] fix Content Mode options and few other changes - fix setupRadioButtons (Content Mode options) - update integrated qtbase_de.qm from Qt 6.4 - bump copyright year and some version numbers (again) --- OptionsDialog.cpp | 8 +++++--- config.h | 2 +- res/app.rc | 4 ++-- res/qt6/qtbase_de.qm | Bin 212070 -> 213494 bytes 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/OptionsDialog.cpp b/OptionsDialog.cpp index 15d6559..d096383 100644 --- a/OptionsDialog.cpp +++ b/OptionsDialog.cpp @@ -282,6 +282,7 @@ void OptionsDialog::setupRadioButtons() case 0: case 20: ui->rbModern->setChecked(true); + ui->cbDoubleclick->setChecked(false); break; case 1: case 2: @@ -291,11 +292,12 @@ void OptionsDialog::setupRadioButtons() break; case 10: ui->rbClassic->setChecked(true); -#if QT_VERSION >= 0x050800 - Q_FALLTHROUGH(); -#endif + ui->cbDoubleclick->setChecked(false); + break; case 11: + ui->rbClassic->setChecked(true); ui->cbDoubleclick->setChecked(true); + break; } } } diff --git a/config.h b/config.h index 98de378..23874e2 100644 --- a/config.h +++ b/config.h @@ -47,7 +47,7 @@ #endif #ifndef GTA5SYNC_COPYRIGHT -#define GTA5SYNC_COPYRIGHT "2016-2021" +#define GTA5SYNC_COPYRIGHT "2016-2022" #endif #ifndef GTA5SYNC_APPVER diff --git a/res/app.rc b/res/app.rc index b1f5162..87b29d5 100644 --- a/res/app.rc +++ b/res/app.rc @@ -4,8 +4,8 @@ IDI_ICON1 ICON DISCARDABLE "5sync.ico" CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "gta5view.exe.manifest" #include <windows.h> VS_VERSION_INFO VERSIONINFO -FILEVERSION 1, 10, 1, 1 -PRODUCTVERSION 1, 10, 1, 1 +FILEVERSION 1, 10, 1, 2 +PRODUCTVERSION 1, 10, 1, 2 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 diff --git a/res/qt6/qtbase_de.qm b/res/qt6/qtbase_de.qm index 301fa8fe7103f48d68c080f0b901a6411114ebcb..a0d26723ff80b31273e51e09ac4228476338de72 100644 GIT binary patch delta 14006 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 delta 13069 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 bv1WES;(PEI-f+{g97*tJ$NDLR9UcA;z_732 From 13b6d614fc0c5e94088df11b1f57cdbef79ac40e Mon Sep 17 00:00:00 2001 From: Syping <schiedelrafael@keppe.org> Date: Wed, 15 Mar 2023 07:10:50 +0100 Subject: [PATCH 5/6] gta5view 1.10.2 release - fix crash bug and upload issue --- .ci/app.rc | 2 +- .ci/gta5view.nsi | 2 +- .travis.yml | 4 ++-- CMakeLists.txt | 2 +- ProfileInterface.cpp | 12 ++++++++++-- RagePhoto.cpp | 30 ++++++++++++++++++++++++++++- config.h | 4 ++-- res/app.rc | 10 +++++----- res/de.syping.gta5view.metainfo.xml | 1 + 9 files changed, 52 insertions(+), 15 deletions(-) diff --git a/.ci/app.rc b/.ci/app.rc index f247bab..8a785d2 100644 --- a/.ci/app.rc +++ b/.ci/app.rc @@ -24,7 +24,7 @@ BEGIN VALUE "FileDescription", "gta5view" VALUE "FileVersion", "MAJOR_VER.MINOR_VER.PATCH_VERSTR_BUILD_VER" VALUE "InternalName", "gta5view" - VALUE "LegalCopyright", "Copyright � 2016-2022 Syping" + VALUE "LegalCopyright", "Copyright � 2016-2023 Syping" VALUE "OriginalFilename", "gta5view.exe" VALUE "ProductName", "gta5view" VALUE "ProductVersion", "MAJOR_VER.MINOR_VER.PATCH_VERSTR_BUILD_VER" diff --git a/.ci/gta5view.nsi b/.ci/gta5view.nsi index 56ea8fa..1ddd882 100644 --- a/.ci/gta5view.nsi +++ b/.ci/gta5view.nsi @@ -4,7 +4,7 @@ !define APP_EXT ".g5e" !define COMP_NAME "Syping" !define WEB_SITE "https://gta5view.syping.de/" -!define VERSION "1.10.1.1" +!define VERSION "1.10.2.0" !define COPYRIGHT "Copyright © 2016-2022 Syping" !define DESCRIPTION "Open Source Snapmatic and Savegame viewer/editor for GTA V" !define INSTALLER_NAME "gta5view_setup.exe" diff --git a/.travis.yml b/.travis.yml index 8dee407..f6c3397 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ language: cpp services: - docker - + env: global: - BUILD_TYPE=REL @@ -27,7 +27,7 @@ matrix: - QT_SELECT=qt5-x86_64-w64-mingw32 - RELEASE_LABEL="Windows 64-Bit Installer" - os: osx - osx_image: xcode12.2 + osx_image: xcode14.2 env: - BUILD_SCRIPT=osx_ci.sh - RELEASE_LABEL="Mac OS X 64-Bit Disk Image" diff --git a/CMakeLists.txt b/CMakeLists.txt index cbb26a5..dbd21a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ if(APPLE) res/gta5view.icns ) set(MACOSX_BUNDLE_BUNDLE_NAME gta5view) - set(MACOSX_BUNDLE_BUNDLE_VERSION 1.10.1) + set(MACOSX_BUNDLE_BUNDLE_VERSION 1.10.2) set(MACOSX_BUNDLE_ICON_FILE gta5view.icns) set(MACOSX_BUNDLE_GUI_IDENTIFIER de.syping.gta5view) set_source_files_properties(res/gta5view.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") diff --git a/ProfileInterface.cpp b/ProfileInterface.cpp index ce87356..8eca40a 100644 --- a/ProfileInterface.cpp +++ b/ProfileInterface.cpp @@ -287,8 +287,16 @@ void ProfileInterface::directoryChanged(const QString &path) } if (fileName.startsWith("PGTA5") && !fileName.endsWith(".bak")) { t_snapmaticPics << fileName; - if (!snapmaticPics.contains(fileName)) { - n_snapmaticPics << fileName; + if (fileName.endsWith(".hidden")) { + const QString originalFileName = fileName.left(fileName.length() - 7); + if (!snapmaticPics.contains(fileName) && !snapmaticPics.contains(originalFileName)) { + n_snapmaticPics << fileName; + } + } + else { + if (!snapmaticPics.contains(fileName) && !snapmaticPics.contains(fileName % ".hidden")) { + n_snapmaticPics << fileName; + } } } } diff --git a/RagePhoto.cpp b/RagePhoto.cpp index 293d4a8..ba03159 100644 --- a/RagePhoto.cpp +++ b/RagePhoto.cpp @@ -31,6 +31,20 @@ #include <chrono> #endif +inline quint32 joaatFromSI(const char *data, size_t size) +{ + quint32 val = 0xE47AB81CUL; + for (size_t i = 0; i != size; i++) { + val += data[i]; + val += (val << 10); + val ^= (val >> 6); + } + val += (val << 3); + val ^= (val >> 11); + val += (val << 15); + return val; +} + RagePhoto::RagePhoto() { p_photoFormat = PhotoFormat::Undefined; @@ -530,8 +544,15 @@ bool RagePhoto::setJsonData(const QByteArray &data) QJsonDocument t_jsonDocument = QJsonDocument::fromJson(data); if (t_jsonDocument.isNull()) return false; - p_jsonData = t_jsonDocument.toJson(QJsonDocument::Compact); p_jsonObject = t_jsonDocument.object(); + // serializer band-aid + QJsonObject t_jsonObject = p_jsonObject; + t_jsonObject["sign"] = "__gta5view.sign"; + t_jsonDocument.setObject(t_jsonObject); + p_jsonData = t_jsonDocument.toJson(QJsonDocument::Compact); + char sign_char[24]; + sprintf(sign_char, "%llu", (0x100000000000000ULL | joaatFromSI(p_photoData.constData(), p_photoData.size()))); + p_jsonData.replace("\"__gta5view.sign\"", sign_char); return true; } @@ -555,6 +576,8 @@ bool RagePhoto::setPhotoData(const QByteArray &data) if (size > p_photoBuffer) return false; p_photoData = data; + // serializer band-aid + setJsonData(p_jsonData); return true; } @@ -563,6 +586,8 @@ bool RagePhoto::setPhotoData(const char *data, int size) if (static_cast<quint32>(size) > p_photoBuffer) return false; p_photoData = QByteArray(data, size); + // serializer band-aid + setJsonData(p_jsonData); return true; } @@ -640,6 +665,9 @@ QByteArray RagePhoto::save(PhotoFormat photoFormat) void RagePhoto::save(QIODevice *ioDevice, PhotoFormat photoFormat) { + // serializer band-aid + setJsonData(p_jsonData); + if (photoFormat == PhotoFormat::G5EX) { char uInt32Buffer[4]; quint32 format = static_cast<quint32>(PhotoFormat::G5EX); diff --git a/config.h b/config.h index 23874e2..6f96056 100644 --- a/config.h +++ b/config.h @@ -47,11 +47,11 @@ #endif #ifndef GTA5SYNC_COPYRIGHT -#define GTA5SYNC_COPYRIGHT "2016-2022" +#define GTA5SYNC_COPYRIGHT "2016-2023" #endif #ifndef GTA5SYNC_APPVER -#define GTA5SYNC_APPVER "1.10.1" +#define GTA5SYNC_APPVER "1.10.2" #endif #if __cplusplus diff --git a/res/app.rc b/res/app.rc index 87b29d5..56b1561 100644 --- a/res/app.rc +++ b/res/app.rc @@ -4,8 +4,8 @@ IDI_ICON1 ICON DISCARDABLE "5sync.ico" CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "gta5view.exe.manifest" #include <windows.h> VS_VERSION_INFO VERSIONINFO -FILEVERSION 1, 10, 1, 2 -PRODUCTVERSION 1, 10, 1, 2 +FILEVERSION 1, 10, 2, 0 +PRODUCTVERSION 1, 10, 2, 0 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -22,12 +22,12 @@ BEGIN BEGIN VALUE "CompanyName", "Syping" VALUE "FileDescription", "gta5view" - VALUE "FileVersion", "1.10.1" + VALUE "FileVersion", "1.10.2" VALUE "InternalName", "gta5view" - VALUE "LegalCopyright", "Copyright � 2016-2022 Syping" + VALUE "LegalCopyright", "Copyright � 2016-2023 Syping" VALUE "OriginalFilename", "gta5view.exe" VALUE "ProductName", "gta5view" - VALUE "ProductVersion", "1.10.1" + VALUE "ProductVersion", "1.10.2" END END END diff --git a/res/de.syping.gta5view.metainfo.xml b/res/de.syping.gta5view.metainfo.xml index 9bc50a1..87a294f 100644 --- a/res/de.syping.gta5view.metainfo.xml +++ b/res/de.syping.gta5view.metainfo.xml @@ -34,6 +34,7 @@ <developer_name>Syping</developer_name> <releases> + <release date="2022-03-15" version="1.10.2"/> <release date="2021-06-17" version="1.10.1"/> <release date="2021-05-27" version="1.10.0"/> <release date="2021-03-22" version="1.9.2"/> From 20de3627d563a70924304408949914d64126ffb3 Mon Sep 17 00:00:00 2001 From: Rafael <Syping@users.noreply.github.com> Date: Wed, 15 Mar 2023 09:19:24 +0100 Subject: [PATCH 6/6] fix manifest release year --- res/de.syping.gta5view.metainfo.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/de.syping.gta5view.metainfo.xml b/res/de.syping.gta5view.metainfo.xml index 87a294f..c5ab767 100644 --- a/res/de.syping.gta5view.metainfo.xml +++ b/res/de.syping.gta5view.metainfo.xml @@ -34,7 +34,7 @@ <developer_name>Syping</developer_name> <releases> - <release date="2022-03-15" version="1.10.2"/> + <release date="2023-03-15" version="1.10.2"/> <release date="2021-06-17" version="1.10.1"/> <release date="2021-05-27" version="1.10.0"/> <release date="2021-03-22" version="1.9.2"/>