From 32f72bdff581551146eb772a332cf3cd6127678a Mon Sep 17 00:00:00 2001 From: Hleb Valoshka <375gnu@gmail.com> Date: Wed, 29 Mar 2023 17:10:49 +0300 Subject: [PATCH 1/2] Release version 1.6.3 --- ChangeLog | 16 ++++++++++++++++ celestia.iss | 6 +++--- configure.ac | 2 +- macosx/Info.plist | 2 +- po/ar.po | 4 ++-- po/be.po | 4 ++-- po/bg.po | 8 ++++---- po/de.po | 4 ++-- po/el.po | 4 ++-- po/es.po | 4 ++-- po/fr.po | 4 ++-- po/gl.po | 4 ++-- po/hu.po | 4 ++-- po/it.po | 4 ++-- po/ja.po | 4 ++-- po/ko.po | 4 ++-- po/lt.po | 4 ++-- po/lv.po | 4 ++-- po/nb.po | 4 ++-- po/nl.po | 4 ++-- po/pl.po | 4 ++-- po/pt.po | 4 ++-- po/pt_BR.po | 4 ++-- po/ro.po | 4 ++-- po/ru.po | 4 ++-- po/sk.po | 4 ++-- po/sv.po | 4 ++-- po/tr.po | 4 ++-- po/uk.po | 4 ++-- po/zh_CN.po | 4 ++-- po/zh_TW.po | 4 ++-- src/celestia/res/celestia.rc | 2 +- src/celestia/res/resource.h | 2 +- 33 files changed, 79 insertions(+), 63 deletions(-) diff --git a/ChangeLog b/ChangeLog index dfb4f70079..5abaf7554e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1780,3 +1780,19 @@ Bug fixes 1.6.2.2 Bug fixes * Windows: fix bookmark manager + +1.6.3 +Features, backported from 1.7 +* Backport location updates from 1.7 version +* Allow binary orbits without text sources + +Bug fixes +* Fix out-of-bounds in 3DS read +* Handle locations in object:localname() +* macOS: Re-add support for OS X 10.7 to 10.9 +* macOS: Fix flickering edges on some GPU +* Unix: Fix executable name in celestia.desktop +* Unix: Fix buffer overflow in eclipse finder + +Translations +* Update Bulgarian translation diff --git a/celestia.iss b/celestia.iss index 5e94c117aa..6619f60f78 100644 --- a/celestia.iss +++ b/celestia.iss @@ -5,13 +5,13 @@ [Setup] AppName=Celestia -AppVersion=1.6.2.2 -VersionInfoVersion=1.6.2.2 +AppVersion=1.6.3 +VersionInfoVersion=1.6.3 AppPublisher=Celestia Development Team AppPublisherURL=https://celestia.space/ AppSupportURL=https://celestia.space/ AppUpdatesURL=https://celestia.space/ -AppCopyright=Copyright (C) 2001-2020 Celestia Development Team +AppCopyright=Copyright (C) 2001-2023 Celestia Development Team DefaultDirName={code:DefDirRoot}\Celestia DefaultGroupName=Celestia LicenseFile=COPYING diff --git a/configure.ac b/configure.ac index 574e639668..3c682ca38a 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Process this file with autoconf to make a configure script dnl AC_PREREQ(2.57) -AC_INIT([celestia], [1.6.2], [https://github.com/CelestiaProject/Celestia]) +AC_INIT([celestia], [1.6.3], [https://github.com/CelestiaProject/Celestia]) AC_CONFIG_SRCDIR(acinclude.m4) AC_CONFIG_MACRO_DIRS([macros]) diff --git a/macosx/Info.plist b/macosx/Info.plist index 909edc92d4..49afe60aa4 100644 --- a/macosx/Info.plist +++ b/macosx/Info.plist @@ -35,7 +35,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.6.2 + 1.6.3 CFBundleSignature ???? CFBundleURLTypes diff --git a/po/ar.po b/po/ar.po index f4ad0d4bc5..4094d33344 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1357,7 +1357,7 @@ msgstr "معلومات عن OpenGL" #: src/celestia/gtk/actions.cpp:728 #, fuzzy -msgid "Copyright © 2001-2021 Celestia Development Team" +msgid "Copyright © 2001-2023 Celestia Development Team" msgstr "جميع الحقوق محفوظة 2001-2006, Chris Laurel" #: src/celestia/gtk/actions.cpp:1046 @@ -4953,7 +4953,7 @@ msgstr "موافق" #: src/celestia/res/resource_strings.cpp:70 #, fuzzy -msgid "Copyright (C) 2001-2021, Celestia Development Team" +msgid "Copyright (C) 2001-2023, Celestia Development Team" msgstr "جميع الحقوق محفوظة 2001-2006, Chris Laurel" #: src/celestia/res/resource_strings.cpp:71 diff --git a/po/be.po b/po/be.po index 93854592c0..20f55fc54c 100644 --- a/po/be.po +++ b/po/be.po @@ -1319,7 +1319,7 @@ msgstr "Зьвесткі OpenGL" #: src/celestia/gtk/actions.cpp:728 msgid "Copyright © 2001-2020 Celestia Development Team" -msgstr "Аўтарскія правы © 2001-2021, Каманда распрацоўкі Celestia" +msgstr "Аўтарскія правы © 2001-2023, Каманда распрацоўкі Celestia" #: src/celestia/gtk/actions.cpp:1046 #, c-format @@ -4546,7 +4546,7 @@ msgstr "Так" #: src/celestia/res/resource_strings.cpp:70 msgid "Copyright (C) 2001-2020, Celestia Development Team" -msgstr "Аўтарскія правы (C) 2001-2021, Каманда распрацоўкі Celestia" +msgstr "Аўтарскія правы (C) 2001-2023, Каманда распрацоўкі Celestia" #: src/celestia/res/resource_strings.cpp:71 msgid "https://celestia.space" diff --git a/po/bg.po b/po/bg.po index 978ea8c7b0..b787d69a96 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1324,8 +1324,8 @@ msgid "Open GL Info" msgstr "Информация за „OpenGL“" #: src/celestia/gtk/actions.cpp:728 -msgid "Copyright © 2001-2021 Celestia Development Team" -msgstr "Авторско право © 2001-2021, Екипа на „Celestia“" +msgid "Copyright © 2001-2023 Celestia Development Team" +msgstr "Авторско право © 2001-2023, Екипа на „Celestia“" #: src/celestia/gtk/actions.cpp:1046 #, c-format @@ -4548,8 +4548,8 @@ msgid "OK" msgstr "ОК" #: src/celestia/res/resource_strings.cpp:70 -msgid "Copyright (C) 2001-2021, Celestia Development Team" -msgstr "Авторско право (С) 2001-2021, Екипа на „Celestia“" +msgid "Copyright (C) 2001-2023, Celestia Development Team" +msgstr "Авторско право (С) 2001-2023, Екипа на „Celestia“" #: src/celestia/res/resource_strings.cpp:71 msgid "https://celestia.space" diff --git a/po/de.po b/po/de.po index 7938bcde23..dc625dff8e 100644 --- a/po/de.po +++ b/po/de.po @@ -1327,7 +1327,7 @@ msgstr "OpenGL-Informationen" #: src/celestia/gtk/actions.cpp:728 #, fuzzy -msgid "Copyright © 2001-2021 Celestia Development Team" +msgid "Copyright © 2001-2023 Celestia Development Team" msgstr "Copyright (C) 2001-2009, Celestia Development Team" #: src/celestia/gtk/actions.cpp:1046 @@ -4657,7 +4657,7 @@ msgstr "OK" #: src/celestia/res/resource_strings.cpp:70 #, fuzzy -msgid "Copyright (C) 2001-2021, Celestia Development Team" +msgid "Copyright (C) 2001-2023, Celestia Development Team" msgstr "Copyright (C) 2001-2009, Celestia Development Team" #: src/celestia/res/resource_strings.cpp:71 diff --git a/po/el.po b/po/el.po index e6cd8e0a30..aa2b75961f 100644 --- a/po/el.po +++ b/po/el.po @@ -1322,7 +1322,7 @@ msgstr "Πληροφορίες OpenGL" #: src/celestia/gtk/actions.cpp:728 #, fuzzy -msgid "Copyright © 2001-2021 Celestia Development Team" +msgid "Copyright © 2001-2023 Celestia Development Team" msgstr "Πνευματική Ιδιοκτησία (C) 2001-2009, Η Ομάδα Συγγραφής του Celestia" #: src/celestia/gtk/actions.cpp:1046 @@ -4779,7 +4779,7 @@ msgstr "Εντάξει" #: src/celestia/res/resource_strings.cpp:70 #, fuzzy -msgid "Copyright (C) 2001-2021, Celestia Development Team" +msgid "Copyright (C) 2001-2023, Celestia Development Team" msgstr "Πνευματική Ιδιοκτησία (C) 2001-2009, Η Ομάδα Συγγραφής του Celestia" #: src/celestia/res/resource_strings.cpp:71 diff --git a/po/es.po b/po/es.po index 6932517242..2902352ab3 100644 --- a/po/es.po +++ b/po/es.po @@ -1323,7 +1323,7 @@ msgstr "Información OpenGL" #: src/celestia/gtk/actions.cpp:728 #, fuzzy -msgid "Copyright © 2001-2021 Celestia Development Team" +msgid "Copyright © 2001-2023 Celestia Development Team" msgstr "Copyright (C) 2001-2008, Equipo de Desarrollo de Celestia" #: src/celestia/gtk/actions.cpp:1046 @@ -4652,7 +4652,7 @@ msgstr "OK" #: src/celestia/res/resource_strings.cpp:70 #, fuzzy -msgid "Copyright (C) 2001-2021, Celestia Development Team" +msgid "Copyright (C) 2001-2023, Celestia Development Team" msgstr "Copyright (C) 2001-2008, Equipo de Desarrollo de Celestia" #: src/celestia/res/resource_strings.cpp:71 diff --git a/po/fr.po b/po/fr.po index 392e3944ae..26d0ef0865 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1327,7 +1327,7 @@ msgstr "Information OpenGL" #: src/celestia/gtk/actions.cpp:728 #, fuzzy -msgid "Copyright © 2001-2021 Celestia Development Team" +msgid "Copyright © 2001-2023 Celestia Development Team" msgstr "Copyright (C) 2001-2009, L'équipe de développement de Celestia" #: src/celestia/gtk/actions.cpp:1046 @@ -4659,7 +4659,7 @@ msgstr "OK" #: src/celestia/res/resource_strings.cpp:70 #, fuzzy -msgid "Copyright (C) 2001-2021, Celestia Development Team" +msgid "Copyright (C) 2001-2023, Celestia Development Team" msgstr "Copyright (C) 2001-2020, L'équipe de développement de Celestia" #: src/celestia/res/resource_strings.cpp:71 diff --git a/po/gl.po b/po/gl.po index 15d79a1d5b..e8a053cdf5 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1328,7 +1328,7 @@ msgstr "Información OpenGL" #: src/celestia/gtk/actions.cpp:728 #, fuzzy -msgid "Copyright © 2001-2021 Celestia Development Team" +msgid "Copyright © 2001-2023 Celestia Development Team" msgstr "Copyright (C) 2001-2009, Celestia Development Team" #: src/celestia/gtk/actions.cpp:1046 @@ -4661,7 +4661,7 @@ msgstr "OK" #: src/celestia/res/resource_strings.cpp:70 #, fuzzy -msgid "Copyright (C) 2001-2021, Celestia Development Team" +msgid "Copyright (C) 2001-2023, Celestia Development Team" msgstr "Copyright (C) 2001-2009, Celestia Development Team" #: src/celestia/res/resource_strings.cpp:71 diff --git a/po/hu.po b/po/hu.po index 820a4d4dcc..60cbbb145c 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1326,7 +1326,7 @@ msgstr "OpenGL adatok" #: src/celestia/gtk/actions.cpp:728 #, fuzzy -msgid "Copyright © 2001-2021 Celestia Development Team" +msgid "Copyright © 2001-2023 Celestia Development Team" msgstr "Copyright (C) 2001-2008, Celestia Development Team" #: src/celestia/gtk/actions.cpp:1046 @@ -4651,7 +4651,7 @@ msgstr "OK" #: src/celestia/res/resource_strings.cpp:70 #, fuzzy -msgid "Copyright (C) 2001-2021, Celestia Development Team" +msgid "Copyright (C) 2001-2023, Celestia Development Team" msgstr "Copyright (C) 2001-2008, Celestia Development Team" #: src/celestia/res/resource_strings.cpp:71 diff --git a/po/it.po b/po/it.po index 1adb7709d8..852c5268f9 100644 --- a/po/it.po +++ b/po/it.po @@ -1330,7 +1330,7 @@ msgstr "Informazioni su OpenGL" #: src/celestia/gtk/actions.cpp:728 #, fuzzy -msgid "Copyright © 2001-2021 Celestia Development Team" +msgid "Copyright © 2001-2023 Celestia Development Team" msgstr "Diritti (C) 2001-2009, gruppo di sviluppo Celestia" #: src/celestia/gtk/actions.cpp:1046 @@ -4668,7 +4668,7 @@ msgstr "OK" #: src/celestia/res/resource_strings.cpp:70 #, fuzzy -msgid "Copyright (C) 2001-2021, Celestia Development Team" +msgid "Copyright (C) 2001-2023, Celestia Development Team" msgstr "Diritti (C) 2001-2009, gruppo di sviluppo Celestia" #: src/celestia/res/resource_strings.cpp:71 diff --git a/po/ja.po b/po/ja.po index c6add63765..1d32f0ca07 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1322,7 +1322,7 @@ msgstr "OpenGL情報" #: src/celestia/gtk/actions.cpp:728 #, fuzzy -msgid "Copyright © 2001-2021 Celestia Development Team" +msgid "Copyright © 2001-2023 Celestia Development Team" msgstr "Copyright (C) 2001-2009, Celestia Development Team" #: src/celestia/gtk/actions.cpp:1046 @@ -4647,7 +4647,7 @@ msgstr "OK" #: src/celestia/res/resource_strings.cpp:70 #, fuzzy -msgid "Copyright (C) 2001-2021, Celestia Development Team" +msgid "Copyright (C) 2001-2023, Celestia Development Team" msgstr "Copyright (C) 2001-2009, Celestia Development Team" #: src/celestia/res/resource_strings.cpp:71 diff --git a/po/ko.po b/po/ko.po index 0a79072501..0ea1a98789 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1324,7 +1324,7 @@ msgstr "OpenGL정보" #: src/celestia/gtk/actions.cpp:728 #, fuzzy -msgid "Copyright © 2001-2021 Celestia Development Team" +msgid "Copyright © 2001-2023 Celestia Development Team" msgstr "Copyright (C) 2001-2008, 셀레스티아 개발팀" #: src/celestia/gtk/actions.cpp:1046 @@ -4649,7 +4649,7 @@ msgstr "확인" #: src/celestia/res/resource_strings.cpp:70 #, fuzzy -msgid "Copyright (C) 2001-2021, Celestia Development Team" +msgid "Copyright (C) 2001-2023, Celestia Development Team" msgstr "Copyright (C) 2001-2008, 셀레스티아 개발팀" #: src/celestia/res/resource_strings.cpp:71 diff --git a/po/lt.po b/po/lt.po index ee817b7076..d4ff5b0c74 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1314,7 +1314,7 @@ msgstr "OpenGL info" #: src/celestia/gtk/actions.cpp:728 #, fuzzy msgid "Copyright © 2001-2020 Celestia Development Team" -msgstr "Autorinės teisės © 2001-2021, Celestia kūrėjų komanda" +msgstr "Autorinės teisės © 2001-2023, Celestia kūrėjų komanda" #: src/celestia/gtk/actions.cpp:1046 #, c-format @@ -4579,7 +4579,7 @@ msgstr "Gerai" #: src/celestia/res/resource_strings.cpp:70 msgid "Copyright (C) 2001-2020, Celestia Development Team" -msgstr "Autorinės teisės (C) 2001-2021, Celestia kūrėjų komanda" +msgstr "Autorinės teisės (C) 2001-2023, Celestia kūrėjų komanda" #: src/celestia/res/resource_strings.cpp:71 msgid "https://celestia.space" diff --git a/po/lv.po b/po/lv.po index eedf1d13d3..6d21a7f728 100644 --- a/po/lv.po +++ b/po/lv.po @@ -1324,7 +1324,7 @@ msgstr "OpenGL informācija" #: src/celestia/gtk/actions.cpp:728 #, fuzzy -msgid "Copyright © 2001-2021 Celestia Development Team" +msgid "Copyright © 2001-2023 Celestia Development Team" msgstr "Autortiesības (C) 2001-2008, Celestia komanda" #: src/celestia/gtk/actions.cpp:1046 @@ -4697,7 +4697,7 @@ msgstr "Labi" #: src/celestia/res/resource_strings.cpp:70 #, fuzzy -msgid "Copyright (C) 2001-2021, Celestia Development Team" +msgid "Copyright (C) 2001-2023, Celestia Development Team" msgstr "Autortiesības (C) 2001-2008, Celestia komanda" #: src/celestia/res/resource_strings.cpp:71 diff --git a/po/nb.po b/po/nb.po index bbaee08422..2c934fb127 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1327,7 +1327,7 @@ msgstr "OpenGL Info" #: src/celestia/gtk/actions.cpp:728 #, fuzzy -msgid "Copyright © 2001-2021 Celestia Development Team" +msgid "Copyright © 2001-2023 Celestia Development Team" msgstr "Copyright © 2001-2009 Celestia utviklingslag" #: src/celestia/gtk/actions.cpp:1046 @@ -4667,7 +4667,7 @@ msgstr "OK" #: src/celestia/res/resource_strings.cpp:70 #, fuzzy -msgid "Copyright (C) 2001-2021, Celestia Development Team" +msgid "Copyright (C) 2001-2023, Celestia Development Team" msgstr "Copyright © 2001-2009 Celestia utviklingslag" #: src/celestia/res/resource_strings.cpp:71 diff --git a/po/nl.po b/po/nl.po index 1ff5c3fc16..62f7addd09 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1321,7 +1321,7 @@ msgstr "OpenGL info" #: src/celestia/gtk/actions.cpp:728 #, fuzzy -msgid "Copyright © 2001-2021 Celestia Development Team" +msgid "Copyright © 2001-2023 Celestia Development Team" msgstr "Copyright (C) 2001-2009, Celestia Ontwikkelteam" #: src/celestia/gtk/actions.cpp:1046 @@ -4650,7 +4650,7 @@ msgstr "OK" #: src/celestia/res/resource_strings.cpp:70 #, fuzzy -msgid "Copyright (C) 2001-2021, Celestia Development Team" +msgid "Copyright (C) 2001-2023, Celestia Development Team" msgstr "Copyright (C) 2001-2009, Celestia Ontwikkelteam" #: src/celestia/res/resource_strings.cpp:71 diff --git a/po/pl.po b/po/pl.po index 736f5f61f2..c3ab750313 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1321,7 +1321,7 @@ msgstr "Informacje OpenGL" #: src/celestia/gtk/actions.cpp:728 #, fuzzy -msgid "Copyright © 2001-2021 Celestia Development Team" +msgid "Copyright © 2001-2023 Celestia Development Team" msgstr "Copyright (C) 2001-2009, Zespól twórców programu Celestia" #: src/celestia/gtk/actions.cpp:1046 @@ -4649,7 +4649,7 @@ msgstr "OK" #: src/celestia/res/resource_strings.cpp:70 #, fuzzy -msgid "Copyright (C) 2001-2021, Celestia Development Team" +msgid "Copyright (C) 2001-2023, Celestia Development Team" msgstr "Copyright (C) 2001-2009, Zespól twórców programu Celestia" #: src/celestia/res/resource_strings.cpp:71 diff --git a/po/pt.po b/po/pt.po index 7e9998260d..9e7fc1f784 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1327,7 +1327,7 @@ msgstr "Informação do OpenGL" #: src/celestia/gtk/actions.cpp:728 #, fuzzy -msgid "Copyright © 2001-2021 Celestia Development Team" +msgid "Copyright © 2001-2023 Celestia Development Team" msgstr "Copr. (C) 2001-2008, Equipa de Desenv. do Celestia" #: src/celestia/gtk/actions.cpp:1046 @@ -4896,7 +4896,7 @@ msgstr "OK" #: src/celestia/res/resource_strings.cpp:70 #, fuzzy -msgid "Copyright (C) 2001-2021, Celestia Development Team" +msgid "Copyright (C) 2001-2023, Celestia Development Team" msgstr "Copr. (C) 2001-2008, Equipa de Desenv. do Celestia" #: src/celestia/res/resource_strings.cpp:71 diff --git a/po/pt_BR.po b/po/pt_BR.po index 0e3dbc25c7..3d83d5b49f 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1324,7 +1324,7 @@ msgstr "Informação do OpenGL" #: src/celestia/gtk/actions.cpp:728 #, fuzzy -msgid "Copyright © 2001-2021 Celestia Development Team" +msgid "Copyright © 2001-2023 Celestia Development Team" msgstr "Copyright (C) 2001-2008, Grupo de Desenvolvimento do Celestia" #: src/celestia/gtk/actions.cpp:1046 @@ -4653,7 +4653,7 @@ msgstr "OK" #: src/celestia/res/resource_strings.cpp:70 #, fuzzy -msgid "Copyright (C) 2001-2021, Celestia Development Team" +msgid "Copyright (C) 2001-2023, Celestia Development Team" msgstr "Copyright (C) 2001-2008, Grupo de Desenvolvimento do Celestia" #: src/celestia/res/resource_strings.cpp:71 diff --git a/po/ro.po b/po/ro.po index 01ab7ba1ac..9f0c8ef026 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1324,7 +1324,7 @@ msgstr "Informaţii OpenGL" #: src/celestia/gtk/actions.cpp:728 #, fuzzy -msgid "Copyright © 2001-2021 Celestia Development Team" +msgid "Copyright © 2001-2023 Celestia Development Team" msgstr "Copyright (C) 2001-2008, Celestia Development Team" #: src/celestia/gtk/actions.cpp:1046 @@ -4894,7 +4894,7 @@ msgstr "OK" #: src/celestia/res/resource_strings.cpp:70 #, fuzzy -msgid "Copyright (C) 2001-2021, Celestia Development Team" +msgid "Copyright (C) 2001-2023, Celestia Development Team" msgstr "Copyright (C) 2001-2008, Celestia Development Team" #: src/celestia/res/resource_strings.cpp:71 diff --git a/po/ru.po b/po/ru.po index b163680839..0c3ccbaacc 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1324,7 +1324,7 @@ msgstr "Информация OpenGL" #: src/celestia/gtk/actions.cpp:728 #, fuzzy -msgid "Copyright © 2001-2021 Celestia Development Team" +msgid "Copyright © 2001-2023 Celestia Development Team" msgstr "Авторские права (C) 2001-2010, команда разработчиков Celestia" #: src/celestia/gtk/actions.cpp:1046 @@ -4649,7 +4649,7 @@ msgstr "OK" #: src/celestia/res/resource_strings.cpp:70 #, fuzzy -msgid "Copyright (C) 2001-2021, Celestia Development Team" +msgid "Copyright (C) 2001-2023, Celestia Development Team" msgstr "Авторские права (C) 2001-2020, команда разработчиков Celestia" #: src/celestia/res/resource_strings.cpp:71 diff --git a/po/sk.po b/po/sk.po index f46e9cf4e8..4065255e15 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1329,7 +1329,7 @@ msgstr "Informácie o OpenGL" #: src/celestia/gtk/actions.cpp:728 #, fuzzy -msgid "Copyright © 2001-2021 Celestia Development Team" +msgid "Copyright © 2001-2023 Celestia Development Team" msgstr "Copyright (C) 2001-2009, Vývojový tím Celestie" #: src/celestia/gtk/actions.cpp:1046 @@ -4664,7 +4664,7 @@ msgstr "OK" #: src/celestia/res/resource_strings.cpp:70 #, fuzzy -msgid "Copyright (C) 2001-2021, Celestia Development Team" +msgid "Copyright (C) 2001-2023, Celestia Development Team" msgstr "Copyright (C) 2001-2009, Vývojový tím Celestie" #: src/celestia/res/resource_strings.cpp:71 diff --git a/po/sv.po b/po/sv.po index 77de9e4a4e..a19f4cf49f 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1321,7 +1321,7 @@ msgstr "OpenGL-Info" #: src/celestia/gtk/actions.cpp:728 #, fuzzy -msgid "Copyright © 2001-2021 Celestia Development Team" +msgid "Copyright © 2001-2023 Celestia Development Team" msgstr "Copyright © 2001-2009, Celestias utvecklingsgrupp" #: src/celestia/gtk/actions.cpp:1046 @@ -4657,7 +4657,7 @@ msgstr "OK" #: src/celestia/res/resource_strings.cpp:70 #, fuzzy -msgid "Copyright (C) 2001-2021, Celestia Development Team" +msgid "Copyright (C) 2001-2023, Celestia Development Team" msgstr "Copyright © 2001-2009, Celestias utvecklingsgrupp" #: src/celestia/res/resource_strings.cpp:71 diff --git a/po/tr.po b/po/tr.po index 758be61657..8176a78481 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1317,7 +1317,7 @@ msgstr "OpenGL Bilgi" #: src/celestia/gtk/actions.cpp:728 #, fuzzy -msgid "Copyright © 2001-2021 Celestia Development Team" +msgid "Copyright © 2001-2023 Celestia Development Team" msgstr "Telif hakkı (C) 2001-2009, Celestia Geliştirme Ekibi" #: src/celestia/gtk/actions.cpp:1046 @@ -4591,7 +4591,7 @@ msgstr "TAMAM" #: src/celestia/res/resource_strings.cpp:70 #, fuzzy -msgid "Copyright (C) 2001-2021, Celestia Development Team" +msgid "Copyright (C) 2001-2023, Celestia Development Team" msgstr "Telif hakkı (C) 2001-2009, Celestia Geliştirme Ekibi" #: src/celestia/res/resource_strings.cpp:71 diff --git a/po/uk.po b/po/uk.po index 7cd4f60542..ae07337db3 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1325,7 +1325,7 @@ msgstr "Інформація щодо OpenGL" #: src/celestia/gtk/actions.cpp:728 #, fuzzy -msgid "Copyright © 2001-2021 Celestia Development Team" +msgid "Copyright © 2001-2023 Celestia Development Team" msgstr "" "Авторські права на програму належать Команді з розробки Celestia, ©2001–2009." @@ -4657,7 +4657,7 @@ msgstr "Гаразд" #: src/celestia/res/resource_strings.cpp:70 #, fuzzy -msgid "Copyright (C) 2001-2021, Celestia Development Team" +msgid "Copyright (C) 2001-2023, Celestia Development Team" msgstr "" "Авторські права на програму належать Команді з розробки Celestia, ©2001–2009." diff --git a/po/zh_CN.po b/po/zh_CN.po index bcad770a1a..76079709dc 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1319,7 +1319,7 @@ msgstr "OpenGL 信息" #: src/celestia/gtk/actions.cpp:728 #, fuzzy -msgid "Copyright © 2001-2021 Celestia Development Team" +msgid "Copyright © 2001-2023 Celestia Development Team" msgstr "版权所有（C）2001-2009, Celestia 开发团队" #: src/celestia/gtk/actions.cpp:1046 @@ -4643,7 +4643,7 @@ msgstr "确定" #: src/celestia/res/resource_strings.cpp:70 #, fuzzy -msgid "Copyright (C) 2001-2021, Celestia Development Team" +msgid "Copyright (C) 2001-2023, Celestia Development Team" msgstr "版权所有（C）2001-2009, Celestia 开发团队" #: src/celestia/res/resource_strings.cpp:71 diff --git a/po/zh_TW.po b/po/zh_TW.po index 1c7574bdfd..650d4e531e 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1316,7 +1316,7 @@ msgstr "OpenGL 資訊" #: src/celestia/gtk/actions.cpp:728 #, fuzzy -msgid "Copyright © 2001-2021 Celestia Development Team" +msgid "Copyright © 2001-2023 Celestia Development Team" msgstr "Copyright (C) 2001-2009, Celestia 開發團隊" #: src/celestia/gtk/actions.cpp:1046 @@ -4640,7 +4640,7 @@ msgstr "確定" #: src/celestia/res/resource_strings.cpp:70 #, fuzzy -msgid "Copyright (C) 2001-2021, Celestia Development Team" +msgid "Copyright (C) 2001-2023, Celestia Development Team" msgstr "Copyright (C) 2001-2009, Celestia 開發團隊" #: src/celestia/res/resource_strings.cpp:71 diff --git a/src/celestia/res/celestia.rc b/src/celestia/res/celestia.rc index e75c34cbdc..ba70dbcb13 100644 --- a/src/celestia/res/celestia.rc +++ b/src/celestia/res/celestia.rc @@ -503,7 +503,7 @@ BEGIN LTEXT VERSION_STRING,IDC_STATIC,90,17,40,9 - LTEXT "Copyright (C) 2001-2021, Celestia Development Team",IDC_STATIC,56,26,247,9 + LTEXT "Copyright (C) 2001-2023, Celestia Development Team",IDC_STATIC,56,26,247,9 LTEXT "https://celestia.space",IDC_CELESTIALINK,56,43,150,9 diff --git a/src/celestia/res/resource.h b/src/celestia/res/resource.h index fa5aa9f172..cc4f83662d 100644 --- a/src/celestia/res/resource.h +++ b/src/celestia/res/resource.h @@ -2,7 +2,7 @@ // Microsoft Visual C++ generated include file. // Used by celestia.rc // -#define VERSION_STRING "1.6.2.2" +#define VERSION_STRING "1.6.3" #define IDR_MENU1 101 #define IDD_ABOUT 102 #define IDI_CELESTIA_ICON 103 From 35bf569cf01ad867cd24bcae6afb03a47e31c280 Mon Sep 17 00:00:00 2001 From: Andrew Tribick Date: Wed, 29 Mar 2023 21:27:54 +0200 Subject: [PATCH 2/2] Setup automated Windows installer build - Upgrade vcxproj - Retrieve dlls from build directories - Use define for version number in Inno Setup --- .github/workflows/ci.yml | 103 +++++++++++++++++++++++++++++++++++++++ celestia.iss | 43 ++++++++-------- celestia.vcxproj | 10 ++-- 3 files changed, 129 insertions(+), 27 deletions(-) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000000..c810bd6bf7 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,103 @@ +name: Celestia + +on: + push: + branches: [ 1.6.x ] + paths: [ src/**, .github/workflows/ci.yml, celestia.sln, celestia.vcxproj, celestia.iss ] + pull_request: + branches: [ 1.6.x ] + paths: [ src/**, .github/workflows/ci.yml, celestia.sln, celestia.vcxproj, celestia.iss ] + +env: + VCPKG_BINARY_SOURCES: 'clear;nuget,GitHub,readwrite' + +jobs: + build-windows: + name: "Build and package Windows" + runs-on: windows-latest + strategy: + fail-fast: false + + steps: + - name: Update vcpkg + shell: pwsh + run: | + $vcpkgCommit = '69efe9cc2df0015f0bb2d37d55acde4a75c9a25b' + pushd $env:VCPKG_INSTALLATION_ROOT + git fetch --depth=1 origin $vcpkgCommit + git reset --hard $vcpkgCommit + ./bootstrap-vcpkg.bat + popd + + - name: Setup Nuget Credentials + shell: pwsh + run: | + $nugetCmd = vcpkg fetch nuget | Select-Object -Last 1 + $nugetSource = 'https://nuget.pkg.github.com/CelestiaProject/index.json' + & "$nugetCmd" sources add ` + -Source "$nugetSource" ` + -StorePasswordInClearText ` + -Name "GitHub" ` + -Username 'CelestiaProject' ` + -Password '${{secrets.GITHUB_TOKEN}}' + & "$nugetCmd" setapikey '${{secrets.GITHUB_TOKEN}}' ` + -Source "$nugetSource" + + - name: Setup vcpkg integration + shell: pwsh + run: | + vcpkg integrate install + + - name: Install dependencies (x64) + shell: pwsh + run: | + vcpkg --triplet=x64-windows install --recurse libpng libjpeg-turbo gettext[tools] luajit cspice + echo "$env:VCPKG_INSTALLATION_ROOT/installed/x64-windows/tools/gettext/bin" >> $env:GITHUB_PATH + + - name: Install dependencies (x86) + shell: pwsh + run: | + vcpkg --triplet=x86-windows install --recurse libpng libjpeg-turbo gettext luajit cspice + + - name: Checkout source code + uses: actions/checkout@v3 + + - name: Build Win32 + shell: pwsh + run: | + $installationPath = vswhere.exe -prerelease -latest -property installationPath + if ($installationPath -and (Test-Path "$installationPath\Common7\Tools\vsdevcmd.bat")) { + & "${env:COMSPEC}" /s /c "`"$installationPath\Common7\Tools\vsdevcmd.bat`" -no_logo -arch=x86 -host_arch=amd64 && set" | ForEach-Object { + $name, $value = $_ -split '=', 2 + Set-Content env:\"$name" $value + } + } + $VcpkgIncludeDir32 = "$env:VCPKG_INSTALLATION_ROOT/installed/x86-windows/include" + msbuild celestia.sln /p:Configuration=Release /p:Platform=Win32 "/p:IncludePath=`"$VcpkgIncludeDir32/cspice;$VcpkgIncludeDir32/luajit`"" + perl po/translate_resources.pl Win32 + + - name: Build x64 + shell: pwsh + run: | + $installationPath = vswhere.exe -prerelease -latest -property installationPath + if ($installationPath -and (Test-Path "$installationPath\Common7\Tools\vsdevcmd.bat")) { + & "${env:COMSPEC}" /s /c "`"$installationPath\Common7\Tools\vsdevcmd.bat`" -no_logo -arch=amd64 -host_arch=amd64 && set" | ForEach-Object { + $name, $value = $_ -split '=', 2 + Set-Content env:\"$name" $value + } + } + $VcpkgIncludeDir64 = "$env:VCPKG_INSTALLATION_ROOT/installed/x64-windows/include" + msbuild celestia.sln /p:Configuration=Release /p:Platform=x64 "/p:IncludePath=`"$VcpkgIncludeDir64/cspice;$VcpkgIncludeDir64/luajit`"" + perl po/translate_resources.pl x64 + + - name: Create installer + shell: pwsh + run: ISCC celestia.iss + + - name: Upload artifacts + uses: actions/upload-artifact@v3 + if: success() + with: + name: celestia-windows-installer + path: | + ${{github.workspace}}/Output/**.exe diff --git a/celestia.iss b/celestia.iss index 6619f60f78..080272c7c4 100644 --- a/celestia.iss +++ b/celestia.iss @@ -3,15 +3,18 @@ ; This script was tested with Inno Setup Compiler version 5.1.5 +#define CelestiaVersion "1.6.3" + [Setup] AppName=Celestia -AppVersion=1.6.3 -VersionInfoVersion=1.6.3 +AppVersion={#CelestiaVersion} +VersionInfoVersion={#CelestiaVersion} AppPublisher=Celestia Development Team AppPublisherURL=https://celestia.space/ AppSupportURL=https://celestia.space/ AppUpdatesURL=https://celestia.space/ AppCopyright=Copyright (C) 2001-2023 Celestia Development Team +OutputBaseFilename=celestia-{#CelestiaVersion} DefaultDirName={code:DefDirRoot}\Celestia DefaultGroupName=Celestia LicenseFile=COPYING @@ -67,24 +70,22 @@ Name: "{app}\help" Name: "{app}\help\CelestiaGuide" [Files] -Source: "x64\Release\celestia.exe"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "win32\Release\celestia.exe"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "c:\tools\vcpkg\installed\x64-windows\bin\cspice.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "c:\tools\vcpkg\installed\x86-windows\bin\cspice.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "c:\tools\vcpkg\installed\x64-windows\bin\jpeg62.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "c:\tools\vcpkg\installed\x86-windows\bin\jpeg62.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "c:\tools\vcpkg\installed\x64-windows\bin\libintl.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "c:\tools\vcpkg\installed\x86-windows\bin\libintl.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "c:\tools\vcpkg\installed\x64-windows\bin\libiconv.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "c:\tools\vcpkg\installed\x86-windows\bin\libiconv.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "c:\tools\vcpkg\installed\x64-windows\bin\libcharset.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "c:\tools\vcpkg\installed\x86-windows\bin\libcharset.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "c:\tools\vcpkg\installed\x64-windows\bin\libpng16.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "c:\tools\vcpkg\installed\x86-windows\bin\libpng16.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "c:\tools\vcpkg\installed\x64-windows\bin\lua51.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "c:\tools\vcpkg\installed\x86-windows\bin\lua51.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "c:\tools\vcpkg\installed\x64-windows\bin\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "c:\tools\vcpkg\installed\x86-windows\bin\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode +Source: "x64\Release\celestia.exe"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "Win32\Release\celestia.exe"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode +Source: "x64\Release\cspice.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "Win32\Release\cspice.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode +Source: "x64\Release\jpeg62.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "Win32\Release\jpeg62.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode +Source: "x64\Release\intl-8.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "Win32\Release\intl-8.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode +Source: "x64\Release\iconv-2.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "Win32\Release\iconv-2.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode +Source: "x64\Release\libpng16.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "Win32\Release\libpng16.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode +Source: "x64\Release\lua51.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "Win32\Release\lua51.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode +Source: "x64\Release\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "Win32\Release\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "start.cel"; DestDir: "{app}"; Flags: ignoreversion Source: "celestia.cfg"; DestDir: "{app}"; Flags: ignoreversion Source: "demo.cel"; DestDir: "{app}"; Flags: ignoreversion @@ -187,8 +188,6 @@ Source: "locale\nb\LC_MESSAGES\celestia.mo"; DestDir: "{app Source: "locale\nb\LC_MESSAGES\celestia_constellations.mo"; DestDir: "{app}/locale/nb/LC_MESSAGES"; Flags: ignoreversion Source: "locale\nl\LC_MESSAGES\celestia.mo"; DestDir: "{app}/locale/nl/LC_MESSAGES"; Flags: ignoreversion Source: "locale\nl\LC_MESSAGES\celestia_constellations.mo"; DestDir: "{app}/locale/nl/LC_MESSAGES"; Flags: ignoreversion -Source: "locale\no\LC_MESSAGES\celestia.mo"; DestDir: "{app}/locale/no/LC_MESSAGES"; Flags: ignoreversion -Source: "locale\no\LC_MESSAGES\celestia_constellations.mo"; DestDir: "{app}/locale/no/LC_MESSAGES"; Flags: ignoreversion Source: "locale\pl\LC_MESSAGES\celestia.mo"; DestDir: "{app}/locale/pl/LC_MESSAGES"; Flags: ignoreversion Source: "locale\pl\LC_MESSAGES\celestia_constellations.mo"; DestDir: "{app}/locale/pl/LC_MESSAGES"; Flags: ignoreversion Source: "locale\pt\LC_MESSAGES\celestia.mo"; DestDir: "{app}/locale/pt/LC_MESSAGES"; Flags: ignoreversion diff --git a/celestia.vcxproj b/celestia.vcxproj index 2b4a40ef9d..4059f83d4e 100755 --- a/celestia.vcxproj +++ b/celestia.vcxproj @@ -20,24 +20,24 @@ {DDDE8EA8-F55A-491B-A102-11C9C01B4B58} - 10.0.17763.0 + 10.0 Application - v141 + v143 Application - v141 + v143 Application - v141 + v143 Application - v141 + v143