diff --git a/AboutDialog.cpp b/AboutDialog.cpp index 2c075dd..20d1296 100644 --- a/AboutDialog.cpp +++ b/AboutDialog.cpp @@ -37,41 +37,30 @@ AboutDialog::AboutDialog(QWidget *parent) : QString buildStr = GTA5SYNC_BUILDSTRING; // Translator Comments - //: Using specific library, example Using libmyfuck - QString usingStr = tr("Using %1 %2"); //: Translated by translator, example Translated by Syping QString translatedByStr = tr("Translated by %1"); - //: Enter your name there - QString translatedByVal = tr("NAME_OF_TRANSLATOR"); - //: Enter your proilfe there, example a GitHub profile, E-Mail with "mailto: afucker@sumfuck.com" or a webpage - QString translatorProfile = tr("TRANSLATOR_PROFILE"); - QString additionalContent = ""; - if (translatedByVal != "NAME_OF_TRANSLATOR") + //: Insert your name here and profile here in following scheme, First Translator,First Profile\\nSecond Translator\\nThird Translator,Second Profile + QString translatorVal = tr("TRANSLATOR"); + QStringList translatorContent; + if (translatorVal != "TRANSLATOR") { - if (translatorProfile != "TRANSLATOR_PROFILE") + const QStringList translatorList = translatorVal.split('\n'); + for (const QString &translatorStr : translatorList) { - additionalContent += translatedByStr.arg(QString("%2").arg(translatorProfile, translatedByVal)); - } - else - { - additionalContent += translatedByStr.arg(translatedByVal); + QStringList translatorStrList = translatorStr.split(','); + QString translatorName = translatorStrList.at(0); + translatorStrList.removeFirst(); + QString translatorProfile = translatorStrList.join(QString()); + if (!translatorProfile.isEmpty()) + { + translatorContent += QString("%2").arg(translatorProfile, translatorName); + } + else + { + translatorContent += translatorName; + } } } -#ifdef WITH_LIBJPEGTURBO // DONT USE IT FOR NOW - bool additionalContentClip = false; - if (!additionalContent.isEmpty()) - { - additionalContentClip = true; - additionalContent += " ("; - } - additionalContent += usingStr.arg("libjpegturbo", WITH_LIBJPEGTURBO); - if (additionalContentClip) - { - additionalContent += ")"; - } -#else - Q_UNUSED(usingStr) -#endif // Project Description #ifdef GTA5SYNC_ENABLED @@ -86,9 +75,9 @@ AboutDialog::AboutDialog(QWidget *parent) : QString copyrightDes2 = tr("%1 is licensed under GNU GPLv3"); copyrightDes2 = copyrightDes2.arg(GTA5SYNC_APPSTR); QString copyrightDesA; - if (!additionalContent.isEmpty()) + if (!translatorContent.isEmpty()) { - copyrightDesA = copyrightDes1 % "
" % additionalContent % "
" % copyrightDes2; + copyrightDesA = copyrightDes1 % "
" % translatedByStr.arg(translatorContent.join(", ")) % "
" % copyrightDes2; } else { @@ -114,7 +103,7 @@ AboutDialog::AboutDialog(QWidget *parent) : // DPI calculation qreal screenRatio = AppEnv::screenRatio(); - if (!additionalContent.isEmpty()) + if (!translatorContent.isEmpty()) { resize(375 * screenRatio, 270 * screenRatio); } diff --git a/lang/gta5sync_no.ts b/lang/gta5sync_no.ts index 7391c43..e1b8829 100644 --- a/lang/gta5sync_no.ts +++ b/lang/gta5sync_no.ts @@ -29,47 +29,35 @@ Running with Qt %6<br/> - Using %1 %2 - Using specific library, example Using libmyfuck - - - - Translated by %1 Translated by translator, example Translated by Syping - - NAME_OF_TRANSLATOR - Enter your name there + + TRANSLATOR + Insert your name here and profile here in following scheme, First Translator,First Profile\nSecond Translator\nThird Translator,Second Profile - - TRANSLATOR_PROFILE - Enter your proilfe there, example a GitHub profile, E-Mail with "mailto: afucker@sumfuck.com" or a webpage - - - - + A project for viewing and sync Grand Theft Auto V Snapmatic<br/> Pictures and Savegames - + 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> diff --git a/res/gta5sync_de.qm b/res/gta5sync_de.qm index 1ed4c36..c2d6219 100644 Binary files a/res/gta5sync_de.qm and b/res/gta5sync_de.qm differ diff --git a/res/gta5sync_de.ts b/res/gta5sync_de.ts index cf6fa87..8c90744 100644 --- a/res/gta5sync_de.ts +++ b/res/gta5sync_de.ts @@ -147,13 +147,12 @@ Copyright &copy; <a href="%5">%6</a> %7<br/>%8 i <span style=" font-weight:600;">gta5sync</span><br/><br/>Ein Projekt zum ansehen und synchronisieren von Grand Theft Auto 5 Snapmatic Bilder und Spielständen<br/><br/>Projektversion: %1<br/>Gebaut mit Qt %2<br/>Läuft auf Qt %3<br/><br/>Copyright &copy; <a href="https://github.com/Syping/">Syping</a> 2016<br/>gta5sync is lizenziert unter <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a> - Using %1 %2 Using specific library, example Using libmyfuck - Verwendet %1 %2 + Verwendet %1 %2 - + Translated by %1 Translated by translator, example Translated by Syping Übersetzt von %1 @@ -179,31 +178,35 @@ Copyright &copy; <a href="%5">%6</a> %7<br/>%8 i https://github.com/Syping/ - NAME_OF_TRANSLATOR - Enter your name there - Syping + Insert your name here in following scheme, First Translator\nSecond Translator + Syping - TRANSLATOR_PROFILE - Enter your proilfe there, example a GitHub profile, E-Mail with "mailto: afucker@sumfuck.com" or a webpage - https://github.com/Syping/ + Insert your profile here in following scheme, First Translator,https://my.profile\nSecond Translator,mailto: my@mail.com + Syping,https://github.com/Syping/ - + + TRANSLATOR + Insert your name here and profile here in following scheme, First Translator,First Profile\nSecond Translator\nThird Translator,Second Profile + Syping,https://github.com/Syping/ + + + 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> @@ -212,7 +215,7 @@ Snapmatic Bilder und Spielständen Copyright &copy; <a href="%1">%2</a> %3<br/>%4 ist lizenziert unter <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a> - + A project for viewing and sync Grand Theft Auto V Snapmatic<br/> Pictures and Savegames Ein Projekt zum ansehen und synchronisieren von<br/> diff --git a/res/gta5sync_en_US.qm b/res/gta5sync_en_US.qm index f47f831..6469f65 100644 Binary files a/res/gta5sync_en_US.qm and b/res/gta5sync_en_US.qm differ diff --git a/res/gta5sync_en_US.ts b/res/gta5sync_en_US.ts index 948d834..3bf7d2e 100644 --- a/res/gta5sync_en_US.ts +++ b/res/gta5sync_en_US.ts @@ -29,47 +29,45 @@ Running with Qt %6<br/> - Using %1 %2 - Using specific library, example Using libmyfuck - - - - Translated by %1 Translated by translator, example Translated by Syping - NAME_OF_TRANSLATOR - Enter your name there - Syping + Insert your name here in following scheme, First Translator\nSecond Translator + Syping - TRANSLATOR_PROFILE - Enter your proilfe there, example a GitHub profile, E-Mail with "mailto: afucker@sumfuck.com" or a webpage - https://github.com/Syping/ + Insert your profile here in following scheme, First Translator,https://my.profile\nSecond Translator,mailto: my@mail.com + https://github.com/Syping/ - + + TRANSLATOR + Insert your name here and profile here in following scheme, First Translator,First Profile\nSecond Translator\nThird Translator,Second Profile + Syping,https://github.com/Syping/ + + + A project for viewing and sync Grand Theft Auto V Snapmatic<br/> Pictures and Savegames - + 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> diff --git a/res/gta5sync_fr.qm b/res/gta5sync_fr.qm index 26829fd..157f41e 100644 Binary files a/res/gta5sync_fr.qm and b/res/gta5sync_fr.qm differ diff --git a/res/gta5sync_fr.ts b/res/gta5sync_fr.ts index 5f2e1bb..6345162 100644 --- a/res/gta5sync_fr.ts +++ b/res/gta5sync_fr.ts @@ -131,43 +131,46 @@ Copyright &copy; <a href="%5">%6</a> %7<br/> https://github.com/Ganjalo/ - Using %1 %2 Using specific library, example Using libmyfuck - Utilise %1 %2 + Utilise %1 %2 - + Translated by %1 Translated by translator, example Translated by Syping Traduit par %1 - NAME_OF_TRANSLATOR - Enter your name there - Ganjalo + Insert your name here in following scheme, First Translator\nSecond Translator + Ganjalo - TRANSLATOR_PROFILE - Enter your proilfe there, example a GitHub profile, E-Mail with "mailto: afucker@sumfuck.com" or a webpage - https://github.com/Ganjalo/ + Insert your profile here in following scheme, First Translator,https://my.profile\nSecond Translator,mailto: my@mail.com + https://github.com/Ganjalo/ - + + 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/ + + + 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> @@ -176,7 +179,7 @@ et les fichiers de sauvegarde de Grand Theft Auto V Copyright &copy; <a href="%1">%2</a> %3<br/>%4 est distribué sous license <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a> - + A project for viewing and sync Grand Theft Auto V Snapmatic<br/> Pictures and Savegames Un outil pour gérer et synchroniser les photos Snapmatic<br/> diff --git a/res/gta5sync_ru.qm b/res/gta5sync_ru.qm index 4ccaf02..5edd369 100644 Binary files a/res/gta5sync_ru.qm and b/res/gta5sync_ru.qm differ diff --git a/res/gta5sync_ru.ts b/res/gta5sync_ru.ts index 05d2da5..20dbc40 100644 --- a/res/gta5sync_ru.ts +++ b/res/gta5sync_ru.ts @@ -91,43 +91,46 @@ Running with Qt %6<br/> https://github.com/VADemon/ - Using %1 %2 Using specific library, example Using libmyfuck - Использует %1 %2 + Использует %1 %2 - + Translated by %1 Translated by translator, example Translated by Syping Перевёл %1 - NAME_OF_TRANSLATOR - Enter your name there - VADemon + Insert your name here in following scheme, First Translator\nSecond Translator + VADemon - TRANSLATOR_PROFILE - Enter your proilfe there, example a GitHub profile, E-Mail with "mailto: afucker@sumfuck.com" or a webpage - https://github.com/VADemon/ + Insert your profile here in following scheme, First Translator,https://my.profile\nSecond Translator,mailto: my@mail.com + https://github.com/VADemon/ - + + 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> @@ -136,7 +139,7 @@ Pictures and Savegames Copyright &copy; <a href="%1">%2</a> %3<br/>%4 под лицензией <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a> - + A project for viewing and sync Grand Theft Auto V Snapmatic<br/> Pictures and Savegames Проект для просмотра и синхронизирования <br/>