Skip to content

Commit

Permalink
Correct copyright strings and credits
Browse files Browse the repository at this point in the history
  • Loading branch information
evan-goode committed May 7, 2024
1 parent 4173436 commit 1e0cbf7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
5 changes: 3 additions & 2 deletions launcher/ui/dialogs/AboutDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,13 @@ QString getCreditsHtml()

//: %1 is the name of the launcher, determined at build time, e.g. "Prism Launcher Developers"
stream << "<h3>" << QObject::tr("%1 Developers", "About Credits").arg(BuildConfig.LAUNCHER_DISPLAYNAME) << "</h3>\n";
stream << QString("<p>fn2006 %1</p>\n").arg(getGitHub("fn2006"));
stream << QString("<p>Evan Goode %1</p>\n").arg(getGitHub("evan-goode"));
stream << "<br />\n";

//: %1 is the name of the launcher, determined at build time, e.g. "Prism Launcher Contributors"
stream << "<h3>" << QObject::tr("%1 Contributors", "About Credits").arg(BuildConfig.LAUNCHER_DISPLAYNAME) << "</h3>\n";
stream << "<h3>" << QObject::tr("%1 Contributors", "About Credits").arg("PollyMC") << "</h3>\n";
stream << QString("<p>fn2006 %1</p>\n").arg(getGitHub("fn2006"));
stream << QString("<p>Evan Goode %1</p>\n").arg(getGitHub("evan-goode"));
stream << QString("<p>anoraktrend %1</p>\n").arg(getGitHub("anoraktrend"));
stream << QString("<p>Emma Tebibyte %1</p>\n").arg(getWebsite("https://tebibyte.media/"));
stream << "<br />\n";
Expand Down
4 changes: 2 additions & 2 deletions program_info/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ set(Launcher_DisplayName "Fjord Launcher")
set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE)
set(Launcher_DisplayName "${Launcher_DisplayName}" PARENT_SCOPE)

set(Launcher_Copyright 2022-2024 Fjord Launcher Contributors\\n© 2022-2024 Prism Launcher Contributors\\n© 2021-2022 PolyMC Contributors\\n© 2012-2021 MultiMC Contributors")
set(Launcher_Copyright_Mac 2022-2024 Fjord Launcher Contributors\\n© 2022-2024 Prism Launcher Contributors, © 2021-2022 PolyMC Contributors and © 2012-2021 MultiMC Contributors" PARENT_SCOPE)
set(Launcher_Copyright 2024-2024 Fjord Launcher Contributors\\n© 2022-2024 PollyMC Contributors\\n© 2022-2024 Prism Launcher Contributors\\n© 2021-2022 PolyMC Contributors\\n© 2012-2021 MultiMC Contributors")
set(Launcher_Copyright_Mac 2024-2024 Fjord Launcher Contributors, © 2022-2024 PollyMC Contributors, © 2022-2024 Prism Launcher Contributors, © 2021-2022 PolyMC Contributors, and © 2012-2021 MultiMC Contributors" PARENT_SCOPE)
set(Launcher_Copyright "${Launcher_Copyright}" PARENT_SCOPE)
set(Launcher_Domain "" PARENT_SCOPE)
set(Launcher_UserAgent "PrismLauncher/${Launcher_RELEASE_VERSION_NAME}" PARENT_SCOPE)
Expand Down
7 changes: 6 additions & 1 deletion program_info/fjordlauncher.6.scd
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,12 @@ GitHub: https://github.com/unmojang/FjordLauncher

# AUTHORS

MultiMC Contributors

PolyMC Contributors

PollyMC Contributors

Prism Launcher Contributors

Fjord Launcher Contributors

0 comments on commit 1e0cbf7

Please sign in to comment.