From e3c9a7ed4f0b07a841e51b8bf2e92c370d21e33c Mon Sep 17 00:00:00 2001 From: Razah <33985414+icnikerazah@users.noreply.github.com> Date: Wed, 3 Jan 2018 18:47:38 +0300 Subject: [PATCH] Fix broken Info.plist after copyright update Fixes #15293. + related misc fixes by @akien-mga. --- editor/editor_about.cpp | 3 ++- misc/dist/osx_tools.app/Contents/Info.plist | 4 ++-- servers/visual/visual_server_wrap_mt.cpp | 1 + servers/visual/visual_server_wrap_mt.h | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/editor/editor_about.cpp b/editor/editor_about.cpp index 1d6d9339245..7fa47761413 100644 --- a/editor/editor_about.cpp +++ b/editor/editor_about.cpp @@ -131,7 +131,8 @@ EditorAbout::EditorAbout() { Label *about_text = memnew(Label); about_text->set_v_size_flags(Control::SIZE_SHRINK_CENTER); - about_text->set_text(VERSION_FULL_NAME + hash + String::utf8("\n\xc2\xa9 2007-2018 Juan Linietsky, Ariel Manzur.\n\xc2\xa9 2014-2017 ") + + about_text->set_text(VERSION_FULL_NAME + hash + + String::utf8("\n\xc2\xa9 2007-2018 Juan Linietsky, Ariel Manzur.\n\xc2\xa9 2014-2018 ") + TTR("Godot Engine contributors") + "\n"); hbc->add_child(about_text); diff --git a/misc/dist/osx_tools.app/Contents/Info.plist b/misc/dist/osx_tools.app/Contents/Info.plist index 2a4914ec752..895eda14db4 100755 --- a/misc/dist/osx_tools.app/Contents/Info.plist +++ b/misc/dist/osx_tools.app/Contents/Info.plist @@ -9,7 +9,7 @@ CFBundleName Godot CFBundleGetInfoString - (c) 2007-2018 Juan Linietsky, Ariel Manzur./string> + (c) 2007-2018 Juan Linietsky, Ariel Manzur. CFBundleIconFile Godot.icns CFBundleIdentifier @@ -25,7 +25,7 @@ CFBundleVersion 3.0-dev NSHumanReadableCopyright - © 2007-2018 Juan Linietsky, Ariel Manzur./string> + © 2007-2018 Juan Linietsky, Ariel Manzur. LSMinimumSystemVersion 10.9.0 LSMinimumSystemVersionByArchitecture diff --git a/servers/visual/visual_server_wrap_mt.cpp b/servers/visual/visual_server_wrap_mt.cpp index a8422b805ed..67b83b76185 100644 --- a/servers/visual/visual_server_wrap_mt.cpp +++ b/servers/visual/visual_server_wrap_mt.cpp @@ -6,6 +6,7 @@ /* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ diff --git a/servers/visual/visual_server_wrap_mt.h b/servers/visual/visual_server_wrap_mt.h index 4062f914388..48a76aea6bc 100644 --- a/servers/visual/visual_server_wrap_mt.h +++ b/servers/visual/visual_server_wrap_mt.h @@ -6,6 +6,7 @@ /* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */