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("<a href=\"%1\">%2</a>").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("<a href=\"%1\">%2</a>").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 <a href=\"https://www.gnu.org/licenses/gpl-3.0.html#content\">GNU GPLv3</a>");
copyrightDes2 = copyrightDes2.arg(GTA5SYNC_APPSTR);
QString copyrightDesA;
- if (!additionalContent.isEmpty())
+ if (!translatorContent.isEmpty())
{
- copyrightDesA = copyrightDes1 % "<br/>" % additionalContent % "<br/>" % copyrightDes2;
+ copyrightDesA = copyrightDes1 % "<br/>" % translatedByStr.arg(translatorContent.join(", ")) % "<br/>" % 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/>
</message>
<message>
<location filename="../AboutDialog.cpp" line="41"/>
- <source>Using %1 %2</source>
- <extracomment>Using specific library, example Using libmyfuck</extracomment>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../AboutDialog.cpp" line="43"/>
<source>Translated by %1</source>
<extracomment>Translated by translator, example Translated by Syping</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="45"/>
- <source>NAME_OF_TRANSLATOR</source>
- <extracomment>Enter your name there</extracomment>
+ <location filename="../AboutDialog.cpp" line="43"/>
+ <source>TRANSLATOR</source>
+ <extracomment>Insert your name here and profile here in following scheme, First Translator,First Profile\nSecond Translator\nThird Translator,Second Profile</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="47"/>
- <source>TRANSLATOR_PROFILE</source>
- <extracomment>Enter your proilfe there, example a GitHub profile, E-Mail with "mailto: afucker@sumfuck.com" or a webpage</extracomment>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../AboutDialog.cpp" line="78"/>
+ <location filename="../AboutDialog.cpp" line="67"/>
<source>A project for viewing and sync Grand Theft Auto V Snapmatic<br/>
Pictures and Savegames</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="80"/>
+ <location filename="../AboutDialog.cpp" line="69"/>
<source>A project for viewing Grand Theft Auto V Snapmatic<br/>
Pictures and Savegames</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="84"/>
+ <location filename="../AboutDialog.cpp" line="73"/>
<source>Copyright &copy; <a href="%1">%2</a> %3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="86"/>
+ <location filename="../AboutDialog.cpp" line="75"/>
<source>%1 is licensed under <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a></source>
<translation type="unfinished"></translation>
</message>
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
<translation type="obsolete"><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></translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="41"/>
<source>Using %1 %2</source>
<extracomment>Using specific library, example Using libmyfuck</extracomment>
- <translation>Verwendet %1 %2</translation>
+ <translation type="vanished">Verwendet %1 %2</translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="43"/>
+ <location filename="../AboutDialog.cpp" line="41"/>
<source>Translated by %1</source>
<extracomment>Translated by translator, example Translated by Syping</extracomment>
<translation>Übersetzt von %1</translation>
@@ -179,31 +178,35 @@ Copyright &copy; <a href="%5">%6</a> %7<br/>%8 i
<translation type="vanished">https://github.com/Syping/</translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="45"/>
<source>NAME_OF_TRANSLATOR</source>
- <extracomment>Enter your name there</extracomment>
- <translation>Syping</translation>
+ <extracomment>Insert your name here in following scheme, First Translator\nSecond Translator</extracomment>
+ <translation type="vanished">Syping</translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="47"/>
<source>TRANSLATOR_PROFILE</source>
- <extracomment>Enter your proilfe there, example a GitHub profile, E-Mail with "mailto: afucker@sumfuck.com" or a webpage</extracomment>
- <translation>https://github.com/Syping/</translation>
+ <extracomment>Insert your profile here in following scheme, First Translator,https://my.profile\nSecond Translator,mailto: my@mail.com</extracomment>
+ <translation type="vanished">Syping,https://github.com/Syping/</translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="80"/>
+ <location filename="../AboutDialog.cpp" line="43"/>
+ <source>TRANSLATOR</source>
+ <extracomment>Insert your name here and profile here in following scheme, First Translator,First Profile\nSecond Translator\nThird Translator,Second Profile</extracomment>
+ <translation>Syping,https://github.com/Syping/</translation>
+ </message>
+ <message>
+ <location filename="../AboutDialog.cpp" line="69"/>
<source>A project for viewing Grand Theft Auto V Snapmatic<br/>
Pictures and Savegames</source>
<translation>Ein Projekt zum ansehen von Grand Theft Auto V<br/>
Snapmatic Bilder und Spielständen</translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="84"/>
+ <location filename="../AboutDialog.cpp" line="73"/>
<source>Copyright &copy; <a href="%1">%2</a> %3</source>
<translation>Copyright &copy; <a href="%1">%2</a> %3</translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="86"/>
+ <location filename="../AboutDialog.cpp" line="75"/>
<source>%1 is licensed under <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a></source>
<translation>%1 ist lizenziert unter <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a></translation>
</message>
@@ -212,7 +215,7 @@ Snapmatic Bilder und Spielständen</translation>
<translation type="vanished">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></translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="78"/>
+ <location filename="../AboutDialog.cpp" line="67"/>
<source>A project for viewing and sync Grand Theft Auto V Snapmatic<br/>
Pictures and Savegames</source>
<translation>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/>
</message>
<message>
<location filename="../AboutDialog.cpp" line="41"/>
- <source>Using %1 %2</source>
- <extracomment>Using specific library, example Using libmyfuck</extracomment>
- <translation></translation>
- </message>
- <message>
- <location filename="../AboutDialog.cpp" line="43"/>
<source>Translated by %1</source>
<extracomment>Translated by translator, example Translated by Syping</extracomment>
<translation></translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="45"/>
<source>NAME_OF_TRANSLATOR</source>
- <extracomment>Enter your name there</extracomment>
- <translation>Syping</translation>
+ <extracomment>Insert your name here in following scheme, First Translator\nSecond Translator</extracomment>
+ <translation type="vanished">Syping</translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="47"/>
<source>TRANSLATOR_PROFILE</source>
- <extracomment>Enter your proilfe there, example a GitHub profile, E-Mail with "mailto: afucker@sumfuck.com" or a webpage</extracomment>
- <translation>https://github.com/Syping/</translation>
+ <extracomment>Insert your profile here in following scheme, First Translator,https://my.profile\nSecond Translator,mailto: my@mail.com</extracomment>
+ <translation type="vanished">https://github.com/Syping/</translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="78"/>
+ <location filename="../AboutDialog.cpp" line="43"/>
+ <source>TRANSLATOR</source>
+ <extracomment>Insert your name here and profile here in following scheme, First Translator,First Profile\nSecond Translator\nThird Translator,Second Profile</extracomment>
+ <translation>Syping,https://github.com/Syping/</translation>
+ </message>
+ <message>
+ <location filename="../AboutDialog.cpp" line="67"/>
<source>A project for viewing and sync Grand Theft Auto V Snapmatic<br/>
Pictures and Savegames</source>
<translation></translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="80"/>
+ <location filename="../AboutDialog.cpp" line="69"/>
<source>A project for viewing Grand Theft Auto V Snapmatic<br/>
Pictures and Savegames</source>
<translation></translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="84"/>
+ <location filename="../AboutDialog.cpp" line="73"/>
<source>Copyright &copy; <a href="%1">%2</a> %3</source>
<translation></translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="86"/>
+ <location filename="../AboutDialog.cpp" line="75"/>
<source>%1 is licensed under <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a></source>
<translation></translation>
</message>
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/>
<translation type="vanished">https://github.com/Ganjalo/</translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="41"/>
<source>Using %1 %2</source>
<extracomment>Using specific library, example Using libmyfuck</extracomment>
- <translation>Utilise %1 %2</translation>
+ <translation type="vanished">Utilise %1 %2</translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="43"/>
+ <location filename="../AboutDialog.cpp" line="41"/>
<source>Translated by %1</source>
<extracomment>Translated by translator, example Translated by Syping</extracomment>
<translation>Traduit par %1</translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="45"/>
<source>NAME_OF_TRANSLATOR</source>
- <extracomment>Enter your name there</extracomment>
- <translation>Ganjalo</translation>
+ <extracomment>Insert your name here in following scheme, First Translator\nSecond Translator</extracomment>
+ <translation type="vanished">Ganjalo</translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="47"/>
<source>TRANSLATOR_PROFILE</source>
- <extracomment>Enter your proilfe there, example a GitHub profile, E-Mail with "mailto: afucker@sumfuck.com" or a webpage</extracomment>
- <translation>https://github.com/Ganjalo/</translation>
+ <extracomment>Insert your profile here in following scheme, First Translator,https://my.profile\nSecond Translator,mailto: my@mail.com</extracomment>
+ <translation type="vanished">https://github.com/Ganjalo/</translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="80"/>
+ <location filename="../AboutDialog.cpp" line="43"/>
+ <source>TRANSLATOR</source>
+ <extracomment>Insert your name here and profile here in following scheme, First Translator,First Profile\nSecond Translator\nThird Translator,Second Profile</extracomment>
+ <translation>Ganjalo,https://github.com/Ganjalo/</translation>
+ </message>
+ <message>
+ <location filename="../AboutDialog.cpp" line="69"/>
<source>A project for viewing Grand Theft Auto V Snapmatic<br/>
Pictures and Savegames</source>
<translation>Un outil pour gérer les photos Snapmatic<br/>
et les fichiers de sauvegarde de Grand Theft Auto V</translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="84"/>
+ <location filename="../AboutDialog.cpp" line="73"/>
<source>Copyright &copy; <a href="%1">%2</a> %3</source>
<translation>Copyright &copy; <a href="%1">%2</a> %3</translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="86"/>
+ <location filename="../AboutDialog.cpp" line="75"/>
<source>%1 is licensed under <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a></source>
<translation>%1 est distribué sous license <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a></translation>
</message>
@@ -176,7 +179,7 @@ et les fichiers de sauvegarde de Grand Theft Auto V</translation>
<translation type="vanished">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></translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="78"/>
+ <location filename="../AboutDialog.cpp" line="67"/>
<source>A project for viewing and sync Grand Theft Auto V Snapmatic<br/>
Pictures and Savegames</source>
<translation>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/>
<translation type="vanished">https://github.com/VADemon/</translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="41"/>
<source>Using %1 %2</source>
<extracomment>Using specific library, example Using libmyfuck</extracomment>
- <translation>Использует %1 %2</translation>
+ <translation type="vanished">Использует %1 %2</translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="43"/>
+ <location filename="../AboutDialog.cpp" line="41"/>
<source>Translated by %1</source>
<extracomment>Translated by translator, example Translated by Syping</extracomment>
<translation>Перевёл %1</translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="45"/>
<source>NAME_OF_TRANSLATOR</source>
- <extracomment>Enter your name there</extracomment>
- <translation>VADemon</translation>
+ <extracomment>Insert your name here in following scheme, First Translator\nSecond Translator</extracomment>
+ <translation type="vanished">VADemon</translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="47"/>
<source>TRANSLATOR_PROFILE</source>
- <extracomment>Enter your proilfe there, example a GitHub profile, E-Mail with "mailto: afucker@sumfuck.com" or a webpage</extracomment>
- <translation>https://github.com/VADemon/</translation>
+ <extracomment>Insert your profile here in following scheme, First Translator,https://my.profile\nSecond Translator,mailto: my@mail.com</extracomment>
+ <translation type="vanished">https://github.com/VADemon/</translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="80"/>
+ <location filename="../AboutDialog.cpp" line="43"/>
+ <source>TRANSLATOR</source>
+ <extracomment>Insert your name here and profile here in following scheme, First Translator,First Profile\nSecond Translator\nThird Translator,Second Profile</extracomment>
+ <translation>VADemon,https://github.com/VADemon/</translation>
+ </message>
+ <message>
+ <location filename="../AboutDialog.cpp" line="69"/>
<source>A project for viewing Grand Theft Auto V Snapmatic<br/>
Pictures and Savegames</source>
<translation>Проект для просмотра Grand Theft Auto V Snapmatic<br/>
картинок и сохранений</translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="84"/>
+ <location filename="../AboutDialog.cpp" line="73"/>
<source>Copyright &copy; <a href="%1">%2</a> %3</source>
<translation>Copyright &copy; <a href="%1">%2</a> %3</translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="86"/>
+ <location filename="../AboutDialog.cpp" line="75"/>
<source>%1 is licensed under <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a></source>
<translation>%1 под лицензией <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a></translation>
</message>
@@ -136,7 +139,7 @@ Pictures and Savegames</source>
<translation type="vanished">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></translation>
</message>
<message>
- <location filename="../AboutDialog.cpp" line="78"/>
+ <location filename="../AboutDialog.cpp" line="67"/>
<source>A project for viewing and sync Grand Theft Auto V Snapmatic<br/>
Pictures and Savegames</source>
<translation>Проект для просмотра и синхронизирования <br/>