From 013bfeb8ed2903b6e32101cca302342e1cbba20d Mon Sep 17 00:00:00 2001 From: Syping Date: Thu, 21 Jan 2021 21:50:18 +0100 Subject: [PATCH] CMake and build type recognition improvements --- .ci/ci.sh | 52 +++++++++++++++++++++--------------------- .ci/osx_build.sh | 2 +- .ci/osx_ci.sh | 2 +- .ci/osx_install.sh | 2 +- AboutDialog.cpp | 10 ++++---- AboutDialog.h | 3 +-- CMakeLists.txt | 46 ++++--------------------------------- config.h | 43 ++++++---------------------------- res/gta5sync.ts | 25 ++++++++++---------- res/gta5sync_de.ts | 25 ++++++++++---------- res/gta5sync_en_US.ts | 25 ++++++++++---------- res/gta5sync_fr.qm | Bin 47993 -> 47995 bytes res/gta5sync_fr.ts | 27 +++++++++++----------- res/gta5sync_ko.ts | 25 ++++++++++---------- res/gta5sync_ru.ts | 25 ++++++++++---------- res/gta5sync_uk.ts | 25 ++++++++++---------- res/gta5sync_zh_TW.ts | 25 ++++++++++---------- 17 files changed, 151 insertions(+), 211 deletions(-) diff --git a/.ci/ci.sh b/.ci/ci.sh index a564d5c..8cc49f6 100755 --- a/.ci/ci.sh +++ b/.ci/ci.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash if [ $(git name-rev --tags --name-only $(git rev-parse HEAD)) == "undefined" ]; then export APPLICATION_VERSION=$(lua -e 'for line in io.lines("config.h") do local m = string.match(line, "#define GTA5SYNC_APPVER \"(.+)\"$"); if m then print(m); os.exit(0) end end') @@ -16,7 +16,7 @@ export APPLICATION_PATCH_VERSION=$(cut -d. -f3 <<< $APPLICATION_VERSION) if [ "${PACKAGE_BUILD}" == "" ]; then export PACKAGE_BUILD=1 else - export APPLICATION_BUILD_INT_VERSION=$(grep -oE "[1-9]*$" <<< $PACKAGE_BUILD) + export APPLICATION_BUILD_INT_VERSION=$(grep -oE '[1-9]*$' <<< $PACKAGE_BUILD) export APPLICATION_BUILD_STR_VERSION=-${PACKAGE_BUILD} fi @@ -30,41 +30,41 @@ cat ".ci/app.rc" | sed \ > "res/app.rc" if [ "${BUILD_TYPE}" == "ALPHA" ]; then - export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE_ALPHA=TRUE" - export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_ALPHA" + export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE=Alpha" + export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Alpha\\\\\\\"" elif [ "${BUILD_TYPE}" == "Alpha" ]; then - export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE_ALPHA=TRUE" - export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_ALPHA" + export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE=Alpha" + export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Alpha\\\\\\\"" elif [ "${BUILD_TYPE}" == "BETA" ]; then - export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE_BETA=TRUE" - export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_BETA" + export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE=Beta" + export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Beta\\\\\\\"" elif [ "${BUILD_TYPE}" == "Beta" ]; then - export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE_BETA=TRUE" - export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_BETA" + export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE=Beta" + export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Beta\\\\\\\"" elif [ "${BUILD_TYPE}" == "DEV" ]; then - export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE_DEV=TRUE" - export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_DEV" + export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE=Developer" + export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Developer\\\\\\\"" elif [ "${BUILD_TYPE}" == "Development" ]; then - export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE_DEV=TRUE" - export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_DEV" + export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE=Developer" + export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Developer\\\\\\\"" elif [ "${BUILD_TYPE}" == "DAILY" ]; then - export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE_DAILY=TRUE" - export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_DAILY" + export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE=Daily Build" + export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Daily Build\\\\\\\"" elif [ "${BUILD_TYPE}" == "Daily" ]; then - export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE_DAILY=TRUE" - export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_DAILY" + export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE=Daily Build" + export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Daily Build\\\\\\\"" elif [ "${BUILD_TYPE}" == "RC" ]; then - export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE_RC=TRUE" - export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_RC" + export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE=Release Candidate" + export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Release Candidate\\\\\\\"" elif [ "${BUILD_TYPE}" == "Release Candidate" ]; then - export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE_RC=TRUE" - export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_RC" + export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE=Release Candidate" + export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Release Candidate\\\\\\\"" elif [ "${BUILD_TYPE}" == "REL" ]; then - export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE_REL=TRUE" - export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_REL" + export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE=Release" + export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Release\\\\\\\"" elif [ "${BUILD_TYPE}" == "Release" ]; then - export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE_REL=TRUE" - export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE_REL" + export CMAKE_BUILD_TYPE="-DGTA5VIEW_BUILDTYPE=Release" + export QMAKE_BUILD_TYPE="DEFINES+=GTA5SYNC_BUILDTYPE=\\\\\\\"Release\\\\\\\"" fi export PROJECT_DIR=$(pwd) diff --git a/.ci/osx_build.sh b/.ci/osx_build.sh index 095a952..18beca7 100755 --- a/.ci/osx_build.sh +++ b/.ci/osx_build.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Creating folders cd ${PROJECT_DIR} && \ diff --git a/.ci/osx_ci.sh b/.ci/osx_ci.sh index b144697..59a722e 100755 --- a/.ci/osx_ci.sh +++ b/.ci/osx_ci.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Install packages .ci/osx_install.sh && \ diff --git a/.ci/osx_install.sh b/.ci/osx_install.sh index 0e8215f..5897e3c 100755 --- a/.ci/osx_install.sh +++ b/.ci/osx_install.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Install packages brew upgrade qt diff --git a/AboutDialog.cpp b/AboutDialog.cpp index c730e6a..af561f6 100644 --- a/AboutDialog.cpp +++ b/AboutDialog.cpp @@ -1,6 +1,6 @@ /***************************************************************************** * gta5view Grand Theft Auto V Profile Viewer -* Copyright (C) 2016-2019 Syping +* Copyright (C) 2016-2021 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 @@ -33,15 +33,13 @@ AboutDialog::AboutDialog(QWidget *parent) : // Build Strings const QString appVersion = QApplication::applicationVersion(); - QString buildType = tr(GTA5SYNC_BUILDTYPE); - buildType.replace("_", " "); + const char* literalBuildType = GTA5SYNC_BUILDTYPE; + const QString buildType = tr(literalBuildType); const QString projectBuild = AppEnv::getBuildDateTime(); const QString buildStr = GTA5SYNC_BUILDSTRING; -#ifndef GTA5SYNC_BUILDTYPE_REL #ifdef GTA5SYNC_COMMIT - if (!appVersion.contains("-")) + if (literalBuildType == REL_BUILDTYPE && !appVersion.contains("-")) appVersion = appVersion % "-" % GTA5SYNC_COMMIT; -#endif #endif // Translator Comments diff --git a/AboutDialog.h b/AboutDialog.h index 1a0a7d9..a13dcc0 100644 --- a/AboutDialog.h +++ b/AboutDialog.h @@ -1,6 +1,6 @@ /***************************************************************************** * gta5view Grand Theft Auto V Profile Viewer -* Copyright (C) 2016-2017 Syping +* Copyright (C) 2016-2021 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 @@ -28,7 +28,6 @@ class AboutDialog; class AboutDialog : public QDialog { Q_OBJECT - public: explicit AboutDialog(QWidget *parent = 0); ~AboutDialog(); diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e978b5..1e199c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,13 +11,12 @@ set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) -option(QT6_BUILD "Build gta5view with Qt6" OFF) -if(QT6_BUILD) - set(QT_VERSION_MAJOR 6) +set(FORCE_QT_VERSION "" CACHE STRING "Force Qt Version") +if(FORCE_QT_VERSION) + set(QT_VERSION_MAJOR ${FORCE_QT_VERSION}) else() - set(QT_VERSION_MAJOR 5) + find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED) endif() - find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Network Svg Widgets REQUIRED) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS LinguistTools QUIET) @@ -192,11 +191,9 @@ else() ) endif() -option(FLATPAK_BUILD "Flatpak modifications and identifications" OFF) +option(FLATPAK_BUILD "Flatpak modifications and optimisations" OFF) if(FLATPAK_BUILD) list(APPEND GTA5VIEW_DEFINES - "-DGTA5SYNC_BUILDCODE=\"Flatpak\"" - "-DGTA5SYNC_BUILDTYPE=\"Flatpak\"" -DGTA5SYNC_FLATPAK ) endif() @@ -275,37 +272,6 @@ if(GTA5VIEW_BUILDTYPE) list(APPEND GTA5VIEW_DEFINES "-DGTA5SYNC_BUILDTYPE=\"${GTA5VIEW_BUILDTYPE}\"" ) -else() - if(GTA5VIEW_BUILDTYPE_ALPHA) - list(APPEND GTA5VIEW_DEFINES - -DGTA5SYNC_BUILDTYPE_ALPHA - ) - endif() - if(GTA5VIEW_BUILDTYPE_BETA) - list(APPEND GTA5VIEW_DEFINES - -DGTA5SYNC_BUILDTYPE_BETA - ) - endif() - if(GTA5VIEW_BUILDTYPE_DEV) - list(APPEND GTA5VIEW_DEFINES - -DGTA5SYNC_BUILDTYPE_DEV - ) - endif() - if(GTA5VIEW_BUILDTYPE_DAILY) - list(APPEND GTA5VIEW_DEFINES - -DGTA5SYNC_BUILDTYPE_DAILY - ) - endif() - if(GTA5VIEW_BUILDTYPE_RC) - list(APPEND GTA5VIEW_DEFINES - -DGTA5SYNC_BUILDTYPE_RC - ) - endif() - if(GTA5VIEW_BUILDTYPE_REL) - list(APPEND GTA5VIEW_DEFINES - -DGTA5SYNC_BUILDTYPE_REL - ) - endif() endif() if(GTA5VIEW_COMMIT) list(APPEND GTA5VIEW_DEFINES @@ -347,8 +313,6 @@ endif() if(Qt5Core_VERSION VERSION_GREATER_EQUAL "5.14.0") qt5_import_plugins(gta5view INCLUDE Qt5::QSvgPlugin) -elseif(Qt6Core_VERSION VERSION_GREATER_EQUAL "6.0") - qt6_import_plugins(gta5view INCLUDE Qt6::QSvgPlugin) endif() target_compile_definitions(gta5view PRIVATE ${GTA5VIEW_DEFINES}) diff --git a/config.h b/config.h index d6518ce..7e66980 100644 --- a/config.h +++ b/config.h @@ -21,6 +21,13 @@ #if __cplusplus #include +#define REL_BUILDTYPE QT_TRANSLATE_NOOP("AboutDialog", "Release") +#define RC_BUILDTYPE QT_TRANSLATE_NOOP("AboutDialog", "Release Candidate") +#define BETA_BUILDTYPE QT_TRANSLATE_NOOP("AboutDialog", "Beta") +#define ALPHA_BUILDTYPE QT_TRANSLATE_NOOP("AboutDialog", "Alpha") +#define DEV_BUILDTYPE QT_TRANSLATE_NOOP("AboutDialog", "Developer") +#define DAILY_BUILDTYPE QT_TRANSLATE_NOOP("AboutDialog", "Daily Build") +#define CUSTOM_BUILDTYPE QT_TRANSLATE_NOOP("AboutDialog", "Custom") #endif #ifndef GTA5SYNC_APPVENDOR @@ -48,42 +55,6 @@ #endif #if __cplusplus -#ifdef GTA5SYNC_BUILDTYPE_REL -#ifndef GTA5SYNC_BUILDTYPE -#define GTA5SYNC_BUILDTYPE QT_TRANSLATE_NOOP("AboutDialog", "Release") -#endif -#endif - -#ifdef GTA5SYNC_BUILDTYPE_RC -#ifndef GTA5SYNC_BUILDTYPE -#define GTA5SYNC_BUILDTYPE QT_TRANSLATE_NOOP("AboutDialog", "Release Candidate") -#endif -#endif - -#ifdef GTA5SYNC_BUILDTYPE_DAILY -#ifndef GTA5SYNC_BUILDTYPE -#define GTA5SYNC_BUILDTYPE QT_TRANSLATE_NOOP("AboutDialog", "Daily Build") -#endif -#endif - -#ifdef GTA5SYNC_BUILDTYPE_DEV -#ifndef GTA5SYNC_BUILDTYPE -#define GTA5SYNC_BUILDTYPE QT_TRANSLATE_NOOP("AboutDialog", "Developer") -#endif -#endif - -#ifdef GTA5SYNC_BUILDTYPE_BETA -#ifndef GTA5SYNC_BUILDTYPE -#define GTA5SYNC_BUILDTYPE QT_TRANSLATE_NOOP("AboutDialog", "Beta") -#endif -#endif - -#ifdef GTA5SYNC_BUILDTYPE_ALPHA -#ifndef GTA5SYNC_BUILDTYPE -#define GTA5SYNC_BUILDTYPE QT_TRANSLATE_NOOP("AboutDialog", "Alpha") -#endif -#endif - #ifndef GTA5SYNC_BUILDTYPE #define GTA5SYNC_BUILDTYPE QT_TRANSLATE_NOOP("AboutDialog", "Custom") #endif diff --git a/res/gta5sync.ts b/res/gta5sync.ts index 7e3a550..2865e92 100644 --- a/res/gta5sync.ts +++ b/res/gta5sync.ts @@ -28,65 +28,66 @@ Running with Qt %6<br/> - + Translated by %1 Translated by translator, example Translated by Syping - + TRANSLATOR Insert your name here and profile here in following scheme, First Translator,First Profile\nSecond Translator\nThird Translator,Second Profile - + A project for viewing Grand Theft Auto V Snapmatic<br/> Pictures and Savegames - + Copyright &copy; <a href="%1">%2</a> %3 - + %1 is licensed under <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a> - + Release - + Release Candidate - + Daily Build - + Developer - + Beta - + Alpha - + + Custom diff --git a/res/gta5sync_de.ts b/res/gta5sync_de.ts index 1fe0328..5896fe6 100644 --- a/res/gta5sync_de.ts +++ b/res/gta5sync_de.ts @@ -37,66 +37,67 @@ Läuft auf Qt %6<br/> S&chließen - + Translated by %1 Translated by translator, example Translated by Syping Übersetzt von %1 - + TRANSLATOR Insert your name here and profile here in following scheme, First Translator,First Profile\nSecond Translator\nThird Translator,Second Profile Syping,g5e://about?U3lwaW5n:R2l0TGFiOiA8YSBocmVmPSJodHRwczovL2dpdGxhYi5jb20vU3lwaW5nIj5TeXBpbmc8L2E+PGJyLz5HaXRIdWI6IDxhIGhyZWY9Imh0dHBzOi8vZ2l0aHViLmNvbS9TeXBpbmciPlN5cGluZzwvYT48YnIvPlNvY2lhbCBDbHViOiA8YSBocmVmPSJodHRwczovL3NvY2lhbGNsdWIucm9ja3N0YXJnYW1lcy5jb20vbWVtYmVyL1N5cGluZy80NjMwMzA1NiI+U3lwaW5nPC9hPg - + A project for viewing Grand Theft Auto V Snapmatic<br/> Pictures and Savegames Ein Projekt zum ansehen von Grand Theft Auto V<br/> Snapmatic Bilder und Spielständen - + Copyright &copy; <a href="%1">%2</a> %3 Copyright &copy; <a href="%1">%2</a> %3 - + %1 is licensed under <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a> %1 ist lizenziert unter <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a> - + Release Release - + Release Candidate Release Candidate - + Daily Build Daily Build - + Developer Entwickler - + Beta Beta - + Alpha Alpha - + + Custom Eigener diff --git a/res/gta5sync_en_US.ts b/res/gta5sync_en_US.ts index d525c0e..ad643bd 100644 --- a/res/gta5sync_en_US.ts +++ b/res/gta5sync_en_US.ts @@ -28,65 +28,66 @@ Running with Qt %6<br/> - + Translated by %1 Translated by translator, example Translated by Syping - + TRANSLATOR Insert your name here and profile here in following scheme, First Translator,First Profile\nSecond Translator\nThird Translator,Second Profile Syping,g5e://about?U3lwaW5n:R2l0TGFiOiA8YSBocmVmPSJodHRwczovL2dpdGxhYi5jb20vU3lwaW5nIj5TeXBpbmc8L2E+PGJyLz5HaXRIdWI6IDxhIGhyZWY9Imh0dHBzOi8vZ2l0aHViLmNvbS9TeXBpbmciPlN5cGluZzwvYT48YnIvPlNvY2lhbCBDbHViOiA8YSBocmVmPSJodHRwczovL3NvY2lhbGNsdWIucm9ja3N0YXJnYW1lcy5jb20vbWVtYmVyL1N5cGluZy80NjMwMzA1NiI+U3lwaW5nPC9hPg== - + A project for viewing Grand Theft Auto V Snapmatic<br/> Pictures and Savegames - + Copyright &copy; <a href="%1">%2</a> %3 - + %1 is licensed under <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a> - + Release - + Release Candidate - + Daily Build - + Developer - + Beta - + Alpha - + + Custom diff --git a/res/gta5sync_fr.qm b/res/gta5sync_fr.qm index d638131027f37c2c39ca25abc33b572d3113d9c6..9c8386dd6817e68fb6a743e63d02b895e75c66d6 100644 GIT binary patch delta 3340 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 diff --git a/res/gta5sync_fr.ts b/res/gta5sync_fr.ts index ce395c9..f35dd75 100644 --- a/res/gta5sync_fr.ts +++ b/res/gta5sync_fr.ts @@ -37,67 +37,68 @@ Fonctionne avec Qt %6<br/> &Fermer - + Translated by %1 Translated by translator, example Translated by Syping Traduit par %1 - + TRANSLATOR Insert your name here and profile here in following scheme, First Translator,First Profile\nSecond Translator\nThird Translator,Second Profile Ganjalo,https://github.com/Ganjalo/ XeriosG,g5e://about?WGVyaW9zRw:RGlzY29yZDogWGVyaW9zRyM1MzIxPGJyLz5TdGVhbTogPGEgaHJlZj0iaHR0cHM6Ly9zdGVhbWNvbW11bml0eS5jb20vcHJvZmlsZXMvNzY1NjExOTg0MjU2NjU3MjQvIj5YZXJpb3NHPC9hPg - + A project for viewing Grand Theft Auto V Snapmatic<br/> Pictures and Savegames Un outil pour gérer les photos Snapmatic<br/> et les fichiers de sauvegarde de Grand Theft Auto V - + Copyright &copy; <a href="%1">%2</a> %3 Copyright &copy; <a href="%1">%2</a> %3 - + %1 is licensed under <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a> %1 est distribué sous license <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a> - + Release Release - + Release Candidate Release Candidate - + Daily Build Daily Build - + Developer Developer - + Beta Beta - + Alpha Alpha - + + Custom Personnalisé @@ -305,7 +306,7 @@ et les fichiers de sauvegarde de Grand Theft Auto V Resolution: - Résolution: + Résolution : diff --git a/res/gta5sync_ko.ts b/res/gta5sync_ko.ts index b46a0b6..815f1fc 100644 --- a/res/gta5sync_ko.ts +++ b/res/gta5sync_ko.ts @@ -37,66 +37,67 @@ Qt로 실행 %6<br/> 닫기(&C) - + Translated by %1 Translated by translator, example Translated by Syping 번역 %1 - + TRANSLATOR Insert your name here and profile here in following scheme, First Translator,First Profile\nSecond Translator\nThird Translator,Second Profile 앙시모사우루스,https://steamcommunity.com/profiles/76561198166105984/ - + A project for viewing Grand Theft Auto V Snapmatic<br/> Pictures and Savegames 이 프로그램은 GTA 5 스냅매틱을 수정하고 보기 위한 프로젝트입니다.<br/> 이미지 뷰어 및 세이브 파일 관리 지원 - + Copyright &copy; <a href="%1">%2</a> %3 저작권 &copy; <a href="%1">%2</a> %3 - + %1 is licensed under <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a> %1는 <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a> 에 따라 라이센스가 부여됩니다 - + Release 릴리즈 - + Release Candidate 릴리즈 후보 - + Daily Build 일일 빌드 - + Developer 개발자 - + Beta 베타 - + Alpha 알파 - + + Custom 사용자 지정 diff --git a/res/gta5sync_ru.ts b/res/gta5sync_ru.ts index 678ac1d..a11f33e 100644 --- a/res/gta5sync_ru.ts +++ b/res/gta5sync_ru.ts @@ -37,66 +37,67 @@ Running with Qt %6<br/> &Закрыть - + Translated by %1 Translated by translator, example Translated by Syping Перевёл %1 - + TRANSLATOR Insert your name here and profile here in following scheme, First Translator,First Profile\nSecond Translator\nThird Translator,Second Profile VADemon,https://github.com/VADemon/ - + A project for viewing Grand Theft Auto V Snapmatic<br/> Pictures and Savegames Проект для просмотра Grand Theft Auto V Snapmatic<br/> картинок и сохранений - + Copyright &copy; <a href="%1">%2</a> %3 Copyright &copy; <a href="%1">%2</a> %3 - + %1 is licensed under <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a> %1 под лицензией <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a> - + Release Релиз - + Release Candidate Предварительный выпуск - + Daily Build Дневная сборка - + Developer Разработчик - + Beta Бета - + Alpha Альфа - + + Custom Не известен контекст diff --git a/res/gta5sync_uk.ts b/res/gta5sync_uk.ts index 4447003..932b1c0 100644 --- a/res/gta5sync_uk.ts +++ b/res/gta5sync_uk.ts @@ -37,13 +37,13 @@ Running with Qt %6<br/> &Закрити - + Translated by %1 Translated by translator, example Translated by Syping Переклад %1 - + TRANSLATOR Insert your name here and profile here in following scheme, First Translator,First Profile\nSecond Translator\nThird Translator,Second Profile PROFessoR 'AppleSOft',https://steamcommunity.com/id/AppleSOft @@ -52,54 +52,55 @@ twitter,https://twitter.com/_VenJam1n VenJam1n,g5e://about?VmVuSmFtMW4:U3RlYW06IDxhIGhyZWY9Imh0dHBzOi8vc3RlYW1jb21tdW5pdHkuY29tL3Byb2ZpbGVzLzc2NTYxMTk3OTg0NjM1ODE2LyI+UFJPRmVzc29SICdBcHBsZVNPZnQnPC9hPjxici8+U29jaWFsIENsdWI6IDxhIGhyZWY9Imh0dHBzOi8vc29jaWFsY2x1Yi5yb2Nrc3RhcmdhbWVzLmNvbS9tZW1iZXIvLS1WZW5KYW0xbi0tLzU2Mzc1NjkiPlZlbkphbTFuPC9hPjxici8+VHdpdHRlcjogPGEgaHJlZj0iaHR0cHM6Ly90d2l0dGVyLmNvbS9fVmVuSmFtMW4iPlZlbkphbTFuPC9hPg - + A project for viewing Grand Theft Auto V Snapmatic<br/> Pictures and Savegames Проект для перегляду Grand Theft Auto V Snapmatic<br/> зображень та сейвів - + Copyright &copy; <a href="%1">%2</a> %3 Авторське право &copy; <a href="%1">%2</a> %3 - + %1 is licensed under <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a> %1 ліцензовано під <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a> - + Release Реліз - + Release Candidate Реліз-Кандидат - + Daily Build Щоденна Збірка - + Developer Розробник - + Beta Бета - + Alpha Альфа - + + Custom Custom diff --git a/res/gta5sync_zh_TW.ts b/res/gta5sync_zh_TW.ts index 7f8d888..9a347ab 100644 --- a/res/gta5sync_zh_TW.ts +++ b/res/gta5sync_zh_TW.ts @@ -37,65 +37,66 @@ Running with Qt %6<br/> 關閉(&C) - + Translated by %1 Translated by translator, example Translated by Syping 繁體中文化: %1 - + TRANSLATOR Insert your name here and profile here in following scheme, First Translator,First Profile\nSecond Translator\nThird Translator,Second Profile Ray,https://steamcommunity.com/profiles/76561198282701714/ - + A project for viewing Grand Theft Auto V Snapmatic<br/> Pictures and Savegames 一個 Grand Theft Auto V Snapmatic 圖片、遊戲存檔檢視專案 - + Copyright &copy; <a href="%1">%2</a> %3 版權 &copy; <a href="%1">%2</a> %3 - + %1 is licensed under <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a> %1 使用 <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a> 授權條款發布 - + Release 正式版本 - + Release Candidate 最終測試版本 - + Daily Build 每日建置版本 - + Developer 開發版本 - + Beta Beta 版本 - + Alpha Alpha 版本 - + + Custom 自訂