diff --git a/CHANGELOG b/CHANGELOG index 5d964efbb6d..3b38ab1d40e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -Next +2025.01.01 - Fix bug that prevented the Configuration GUI from saving to dosbox.conf the last Windows 3.1 theme you applied using the dropdown menu. (joncampbell123). diff --git a/configure.ac b/configure.ac index 7d981307fa6..34aa599113e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Init. -AC_INIT(dosbox-x,2024.12.04,[https://github.com/joncampbell123/dosbox-x/issues],[],[https://dosbox-x.com]) +AC_INIT(dosbox-x,2025.01.01,[https://github.com/joncampbell123/dosbox-x/issues],[],[https://dosbox-x.com]) AC_PREREQ(2.60) AC_CONFIG_SRCDIR(README.md) diff --git a/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in b/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in index 9663f755f1a..cecc95ff2a9 100644 --- a/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in +++ b/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in @@ -1,5 +1,5 @@ - + com.dosbox_x.DOSBox-X GPL-2.0 @@ -10,7 +10,7 @@ Emulation - + diff --git a/contrib/translations/de/de_DE.lng b/contrib/translations/de/de_DE.lng index 63749e535eb..198333ac069 100644 --- a/contrib/translations/de/de_DE.lng +++ b/contrib/translations/de/de_DE.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:German :DOSBOX-X:CODEPAGE:858 -:DOSBOX-X:VERSION:2024.12.04 +:DOSBOX-X:VERSION:2025.01.01 :DOSBOX-X:REMARK: :PROGRAM_BOOT_BOOTING Starte von Laufwerk diff --git a/contrib/translations/de/de_pc98.lng b/contrib/translations/de/de_pc98.lng index de4c5506b86..a8156639ea3 100644 --- a/contrib/translations/de/de_pc98.lng +++ b/contrib/translations/de/de_pc98.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:German :DOSBOX-X:CODEPAGE:858 -:DOSBOX-X:VERSION:2024.12.04 +:DOSBOX-X:VERSION:2025.01.01 :DOSBOX-X:REMARK: :PROGRAM_BOOT_BOOTING Starte von Laufwerk diff --git a/contrib/translations/en/en_US.lng b/contrib/translations/en/en_US.lng index e9be9500974..0465efdb0a7 100644 --- a/contrib/translations/en/en_US.lng +++ b/contrib/translations/en/en_US.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:English (United States) :DOSBOX-X:CODEPAGE:437 -:DOSBOX-X:VERSION:2024.12.04 +:DOSBOX-X:VERSION:2025.01.01 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Lines in this section will be run at startup. diff --git a/contrib/translations/es/es_ES.lng b/contrib/translations/es/es_ES.lng index 695bd1d96ce..be93d37d001 100644 --- a/contrib/translations/es/es_ES.lng +++ b/contrib/translations/es/es_ES.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Spanish (Spain) :DOSBOX-X:CODEPAGE:858 -:DOSBOX-X:VERSION:2024.12.04 +:DOSBOX-X:VERSION:2025.01.01 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Las líneas de esta sección se iniciarán al inicio. diff --git a/contrib/translations/fr/fr_FR.lng b/contrib/translations/fr/fr_FR.lng index ccee46c7d00..ce9999cba00 100644 --- a/contrib/translations/fr/fr_FR.lng +++ b/contrib/translations/fr/fr_FR.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:French (France) :DOSBOX-X:CODEPAGE:859 -:DOSBOX-X:VERSION:2024.12.04 +:DOSBOX-X:VERSION:2025.01.01 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Les lignes de cette section seront exécutées au démarrage. diff --git a/contrib/translations/hu/hu_HU.lng b/contrib/translations/hu/hu_HU.lng index 93439123c09..dca4c73a7c2 100644 --- a/contrib/translations/hu/hu_HU.lng +++ b/contrib/translations/hu/hu_HU.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Hungarian (Hungary) :DOSBOX-X:CODEPAGE:852 -:DOSBOX-X:VERSION:2024.12.04 +:DOSBOX-X:VERSION:2025.01.01 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Ebben a szekcióban lévő sorok indításkor lefutnak. diff --git a/contrib/translations/it/it_IT.lng b/contrib/translations/it/it_IT.lng index da5a4faf0a1..45b5f7d5bec 100644 --- a/contrib/translations/it/it_IT.lng +++ b/contrib/translations/it/it_IT.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Italiano (Italy) :DOSBOX-X:CODEPAGE:437 -:DOSBOX-X:VERSION:2024.12.04 +:DOSBOX-X:VERSION:2025.01.01 :DOSBOX-X:REMARK: :HELP_INFO Fai clic sul pulsante "Aiuto" in basso per avere aiuto dettagliato. diff --git a/contrib/translations/ja/ja_JP.lng b/contrib/translations/ja/ja_JP.lng index 5ab201ab323..62ba86da838 100644 --- a/contrib/translations/ja/ja_JP.lng +++ b/contrib/translations/ja/ja_JP.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Japanese :DOSBOX-X:CODEPAGE:932 -:DOSBOX-X:VERSION:2024.12.04 +:DOSBOX-X:VERSION:2025.01.01 :DOSBOX-X:REMARK:PC-98, JEGA, DOS/V エミュレーション、または とコード ページ 932 の日本語フォントを使用して、日本語の表示と印刷を直接サポートします :AUTOEXEC_CONFIGFILE_HELP このセクションに記載の行は起動時に実行されます。 diff --git a/contrib/translations/ko/ko_KR.lng b/contrib/translations/ko/ko_KR.lng index 3113743276c..32c27b1d8f2 100644 --- a/contrib/translations/ko/ko_KR.lng +++ b/contrib/translations/ko/ko_KR.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Korean :DOSBOX-X:CODEPAGE:949 -:DOSBOX-X:VERSION:2024.12.04 +:DOSBOX-X:VERSION:2025.01.01 :DOSBOX-X:REMARK:DOS/V 에뮬레이션 또는 코드 페이지 949의 한국어 글꼴을 사용하여 한국어 표시 및 인쇄를 직접 지원합니다. :AUTOEXEC_CONFIGFILE_HELP 이 섹션에 나열된 줄은 시작할 때 실행됩니다. diff --git a/contrib/translations/nl/nl_NL.lng b/contrib/translations/nl/nl_NL.lng index 5c22dd31e63..4435d4ab3e3 100644 --- a/contrib/translations/nl/nl_NL.lng +++ b/contrib/translations/nl/nl_NL.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Nederlands (Nederland) :DOSBOX-X:CODEPAGE:858 -:DOSBOX-X:VERSION:2024.12.04 +:DOSBOX-X:VERSION:2025.01.01 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Lijnen in dit gedeelte worden uitgevoerd bij opstarten. diff --git a/contrib/translations/pt/pt_BR.lng b/contrib/translations/pt/pt_BR.lng index 7af5e44e210..2c8c577debc 100644 --- a/contrib/translations/pt/pt_BR.lng +++ b/contrib/translations/pt/pt_BR.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Portuguese (Brazil) :DOSBOX-X:CODEPAGE:860 -:DOSBOX-X:VERSION:2024.12.04 +:DOSBOX-X:VERSION:2025.01.01 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP As linhas nesta seção serão sempre executadas ao se iniciar o DOSBox-X. diff --git a/contrib/translations/ru/ru_RU.lng b/contrib/translations/ru/ru_RU.lng index 62d253fc6fe..dd0aff7efc2 100644 --- a/contrib/translations/ru/ru_RU.lng +++ b/contrib/translations/ru/ru_RU.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Русский (Россия) :DOSBOX-X:CODEPAGE:866 -:DOSBOX-X:VERSION:2024.12.04 +:DOSBOX-X:VERSION:2025.01.01 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Строки в этом разделе будут выполнены при запуске. diff --git a/contrib/translations/tr/tr_TR.lng b/contrib/translations/tr/tr_TR.lng index 36a0341cfde..4c9882b974c 100644 --- a/contrib/translations/tr/tr_TR.lng +++ b/contrib/translations/tr/tr_TR.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Turkish (Turkey) :DOSBOX-X:CODEPAGE:857 -:DOSBOX-X:VERSION:2024.12.04 +:DOSBOX-X:VERSION:2025.01.01 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Lines in this section will be run at startup. diff --git a/contrib/translations/zh/zh_CN.lng b/contrib/translations/zh/zh_CN.lng index 49d46f1e206..cd5c38ecda1 100644 --- a/contrib/translations/zh/zh_CN.lng +++ b/contrib/translations/zh/zh_CN.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Simplified Chinese :DOSBOX-X:CODEPAGE:936 -:DOSBOX-X:VERSION:2024.12.04 +:DOSBOX-X:VERSION:2025.01.01 :DOSBOX-X:REMARK:建议将国家和代码页设为 86,936 并搭配中文字体; 或使用 chs 或 cn 中文 DOS/V 模式以直接支持中文显示和打印 :AUTOEXEC_CONFIGFILE_HELP Lines in this section will be run at startup. diff --git a/contrib/translations/zh/zh_TW.lng b/contrib/translations/zh/zh_TW.lng index 0a9331f5fa8..1faab12e0be 100644 --- a/contrib/translations/zh/zh_TW.lng +++ b/contrib/translations/zh/zh_TW.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Traditional Chinese :DOSBOX-X:CODEPAGE:950 -:DOSBOX-X:VERSION:2024.12.04 +:DOSBOX-X:VERSION:2025.01.01 :DOSBOX-X:REMARK:建議將國家和字碼頁設為 886,950 並搭配中文字型; 或使用 cht 或 tw 中文 DOS/V 模式以直接支援中文顯示和列印 :AUTOEXEC_CONFIGFILE_HELP 區段中的指令行會在啟動時執行. diff --git a/contrib/windows/installer/DOSBox-X-installer.iss b/contrib/windows/installer/DOSBox-X-installer.iss index 17cae5dd5a7..99ab7ede315 100644 --- a/contrib/windows/installer/DOSBox-X-installer.iss +++ b/contrib/windows/installer/DOSBox-X-installer.iss @@ -1,5 +1,5 @@ #define MyAppName "DOSBox-X" -#define MyAppVersion "2024.12.04" +#define MyAppVersion "2025.01.01" #define MyAppBit "(32/64bit for Windows)" #define MyAppPublisher "joncampbell123 [DOSBox-X Team]" #define MyAppURL "https://dosbox-x.com/" diff --git a/contrib/windows/installer/DOSBox-X-setup.iss b/contrib/windows/installer/DOSBox-X-setup.iss index 39b83db4197..46a1b629d41 100644 --- a/contrib/windows/installer/DOSBox-X-setup.iss +++ b/contrib/windows/installer/DOSBox-X-setup.iss @@ -1,5 +1,5 @@ #define MyAppName "DOSBox-X" -#define MyAppVersion "2024.12.04" +#define MyAppVersion "2025.01.01" #define MyAppBit "(32-bit)" #define MyAppPublisher "joncampbell123 [DOSBox-X Team]" #define MyAppURL "https://dosbox-x.com/" diff --git a/contrib/windows/installer/DOSBox-X-setupXP.iss b/contrib/windows/installer/DOSBox-X-setupXP.iss index efeb45e7b3a..5eb5957f165 100644 --- a/contrib/windows/installer/DOSBox-X-setupXP.iss +++ b/contrib/windows/installer/DOSBox-X-setupXP.iss @@ -1,5 +1,5 @@ #define MyAppName "DOSBox-X" -#define MyAppVersion "2024.12.04" +#define MyAppVersion "2025.01.01" #define MyAppBit "(32/64bit for XP)" #define MyAppPublisher "joncampbell123 [DOSBox-X Team]" #define MyAppURL "https://dosbox-x.com/" diff --git a/contrib/windows/installer/dosbox-x.reference.setup.conf b/contrib/windows/installer/dosbox-x.reference.setup.conf index 9fe8e56a4fa..a630c4186f4 100644 --- a/contrib/windows/installer/dosbox-x.reference.setup.conf +++ b/contrib/windows/installer/dosbox-x.reference.setup.conf @@ -1,4 +1,4 @@ -# This is the configuration file for DOSBox-X 2024.12.04. (Please use the latest version of DOSBox-X) +# This is the configuration file for DOSBox-X 2025.01.01. (Please use the latest version of DOSBox-X) # Lines starting with a # are comment lines and are ignored by DOSBox-X. # They are used to (briefly) document the effect of each option. # To write out ALL options, use command 'config -all' with -wc or -writeconf options. diff --git a/dosbox-x.reference.conf b/dosbox-x.reference.conf index db6212312e8..e46a0ed7c4e 100644 --- a/dosbox-x.reference.conf +++ b/dosbox-x.reference.conf @@ -1,4 +1,4 @@ -# This is the configuration file for DOSBox-X 2024.12.04. (Please use the latest version of DOSBox-X) +# This is the configuration file for DOSBox-X 2025.01.01. (Please use the latest version of DOSBox-X) # Lines starting with a # are comment lines and are ignored by DOSBox-X. # They are used to (briefly) document the effect of each option. # To write out ALL options, use command 'config -all' with -wc or -writeconf options. diff --git a/dosbox-x.reference.full.conf b/dosbox-x.reference.full.conf index e1341b044c2..12a0b3df226 100644 --- a/dosbox-x.reference.full.conf +++ b/dosbox-x.reference.full.conf @@ -1,4 +1,4 @@ -# This is the configuration file for DOSBox-X 2024.12.04. (Please use the latest version of DOSBox-X) +# This is the configuration file for DOSBox-X 2025.01.01. (Please use the latest version of DOSBox-X) # Lines starting with a # are comment lines and are ignored by DOSBox-X. # They are used to (briefly) document the effect of each option. # To write out ALL options, use command 'config -all' with -wc or -writeconf options. diff --git a/include/build_timestamp.h b/include/build_timestamp.h index c80f635abbd..f6c23ea6fbe 100644 --- a/include/build_timestamp.h +++ b/include/build_timestamp.h @@ -1,4 +1,4 @@ /*auto-generated*/ -#define UPDATED_STR "Dec 4, 2024 4:59:19pm" -#define GIT_COMMIT_HASH "1f8f8c8" -#define COPYRIGHT_END_YEAR "2024" +#define UPDATED_STR "Dec 31, 2024 9:08:11pm" +#define GIT_COMMIT_HASH "d4ba53e" +#define COPYRIGHT_END_YEAR "2025" diff --git a/src/winres.rc b/src/winres.rc index 7d3b2cd4188..3ead22782c1 100644 --- a/src/winres.rc +++ b/src/winres.rc @@ -3,7 +3,7 @@ #include "../include/resource.h" #include "../vs/config_package.h" -#define VERSION_NUMBER 2024,12,04,0 +#define VERSION_NUMBER 2025,01,01,0 // icon resource dosbox_ico ICON "../contrib/icons/dosbox-x.ico" diff --git a/vs/config_package.h b/vs/config_package.h index 30c25e2b7b1..1aacf6fc795 100644 --- a/vs/config_package.h +++ b/vs/config_package.h @@ -1,8 +1,8 @@ #define PACKAGE "dosbox-x" #define PACKAGE_BUGREPORT "https://github.com/joncampbell123/dosbox-x/issues" #define PACKAGE_NAME "dosbox-x" -#define PACKAGE_STRING "dosbox-x 2024.12.04" +#define PACKAGE_STRING "dosbox-x 2025.01.01" #define PACKAGE_TARNAME "dosbox-x" #define PACKAGE_URL "https://dosbox-x.com" -#define PACKAGE_VERSION "2024.12.04" -#define VERSION "2024.12.04" +#define PACKAGE_VERSION "2025.01.01" +#define VERSION "2025.01.01"