From 33c5415305e5b04f7235de44aa8099cb46b5ce8f Mon Sep 17 00:00:00 2001 From: Jonathan Campbell Date: Fri, 1 Sep 2023 14:49:48 -0700 Subject: [PATCH] Prepare for release --- CHANGELOG | 2 +- configure.ac | 2 +- contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in | 2 +- contrib/translations/de/de_DE.lng | 2 +- contrib/translations/de/de_pc98.lng | 2 +- contrib/translations/en/en_US.lng | 2 +- contrib/translations/es/es_ES.lng | 2 +- contrib/translations/fr/fr_FR.lng | 2 +- contrib/translations/ja/ja_JP.lng | 2 +- contrib/translations/ko/ko_KR.lng | 2 +- contrib/translations/nl/nl_NL.lng | 2 +- contrib/translations/pt/pt_BR.lng | 2 +- contrib/translations/tr/tr_TR.lng | 2 +- contrib/translations/zh/zh_CN.lng | 2 +- contrib/translations/zh/zh_TW.lng | 2 +- contrib/windows/installer/DOSBox-X-installer.iss | 2 +- contrib/windows/installer/DOSBox-X-setup.iss | 2 +- contrib/windows/installer/DOSBox-X-setupXP.iss | 2 +- contrib/windows/installer/dosbox-x.reference.setup.conf | 4 ++-- dosbox-x.reference.conf | 2 +- dosbox-x.reference.full.conf | 4 ++-- include/build_timestamp.h | 4 ++-- vs/config_package.h | 6 +++--- 23 files changed, 28 insertions(+), 28 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 6bfbc4533fe..038c16b8f17 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -2023.08.15 +2023.09.01 - Disable by default message confirmation after snapshot and AVI video capture, but leave the option there for those who want to enable it (joncampbell123). - Remove "LOG: Logging output has been disabled." output when -nolog diff --git a/configure.ac b/configure.ac index 9f4c225d13d..011feb4c9bc 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Init. -AC_INIT(dosbox-x,2023.08.15,[https://github.com/joncampbell123/dosbox-x/issues],[],[https://dosbox-x.com]) +AC_INIT(dosbox-x,2023.09.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 bb62b2510e2..19626b7fb40 100644 --- a/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in +++ b/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in @@ -10,7 +10,7 @@ Emulation - + diff --git a/contrib/translations/de/de_DE.lng b/contrib/translations/de/de_DE.lng index d1a4afce55a..16792d31190 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:2023.08.15 +:DOSBOX-X:VERSION:2023.09.01 :DOSBOX-X:REMARK: :PROGRAM_BOOT_IMAGE_MOUNTED Disketten-Image(s) bereits eingehangen. diff --git a/contrib/translations/de/de_pc98.lng b/contrib/translations/de/de_pc98.lng index 30fec95f816..bc2fc1443fc 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:2023.08.15 +:DOSBOX-X:VERSION:2023.09.01 :DOSBOX-X:REMARK: :PROGRAM_BOOT_IMAGE_MOUNTED Disketten-Image(s) bereits eingehangen. diff --git a/contrib/translations/en/en_US.lng b/contrib/translations/en/en_US.lng index 578c150926f..50bb05b2fa8 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:2023.08.15 +:DOSBOX-X:VERSION:2023.09.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 d007753ce8f..554de78a1c7 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:2023.08.15 +:DOSBOX-X:VERSION:2023.09.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 72b4412ccea..3bcfd60018e 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:2023.08.15 +:DOSBOX-X:VERSION:2023.09.01 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Les lignes de cette section seront exécutées au démarrage. diff --git a/contrib/translations/ja/ja_JP.lng b/contrib/translations/ja/ja_JP.lng index 3f82e52ac54..237d8d4e2f8 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:2023.08.15 +:DOSBOX-X:VERSION:2023.09.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 f5211fb7290..14dd8df5c57 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:2023.08.15 +:DOSBOX-X:VERSION:2023.09.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 1c4c0311807..151f2ce19df 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:2023.08.15 +:DOSBOX-X:VERSION:2023.09.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 15e741e2ac8..2df7ff79e9c 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:2023.08.15 +:DOSBOX-X:VERSION:2023.09.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/tr/tr_TR.lng b/contrib/translations/tr/tr_TR.lng index 32c961c4c8e..492f9b77424 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:2023.08.15 +:DOSBOX-X:VERSION:2023.09.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 2017ee75afa..ce8d03b7cf8 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:2023.08.15 +:DOSBOX-X:VERSION:2023.09.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 1d1ce6065f2..0b530b4b00d 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:2023.08.15 +:DOSBOX-X:VERSION:2023.09.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 5d3060f1f18..4bbf97546d0 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 "2023.08.15" +#define MyAppVersion "2023.09.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 8182e757ba6..9fc57f87ce1 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 "2023.08.15" +#define MyAppVersion "2023.09.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 e0acb5e265d..e2e09edaabd 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 "2023.08.15" +#define MyAppVersion "2023.09.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 e4d1440536f..46623d2c00f 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 2023.08.15. (Please use the latest version of DOSBox-X) +# This is the configuration file for DOSBox-X 2023.09.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. @@ -468,7 +468,7 @@ savefile = saveremark = true forceloadstate = false #DOSBOX-X-ADV:compresssaveparts = true -#DOSBOX-X-ADV:show recorded filename = true +#DOSBOX-X-ADV:show recorded filename = false #DOSBOX-X-ADV:skip encoding unchanged frames = false #DOSBOX-X-ADV:capture chroma format = auto #DOSBOX-X-ADV:capture format = default diff --git a/dosbox-x.reference.conf b/dosbox-x.reference.conf index 5ba3e6a3af0..4e62d35fcc4 100644 --- a/dosbox-x.reference.conf +++ b/dosbox-x.reference.conf @@ -1,4 +1,4 @@ -# This is the configuration file for DOSBox-X 2023.08.15. (Please use the latest version of DOSBox-X) +# This is the configuration file for DOSBox-X 2023.09.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 528d7bceaaa..bff77d27426 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 2023.08.15. (Please use the latest version of DOSBox-X) +# This is the configuration file for DOSBox-X 2023.09.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. @@ -456,7 +456,7 @@ video debug at startup = false saveremark = true forceloadstate = false compresssaveparts = true -show recorded filename = true +show recorded filename = false skip encoding unchanged frames = false capture chroma format = auto capture format = default diff --git a/include/build_timestamp.h b/include/build_timestamp.h index fca0c9dcd3c..45da02ba0b4 100644 --- a/include/build_timestamp.h +++ b/include/build_timestamp.h @@ -1,4 +1,4 @@ /*auto-generated*/ -#define UPDATED_STR "Aug 15, 2023 10:54:37am" -#define GIT_COMMIT_HASH "4327d58" +#define UPDATED_STR "Sep 1, 2023 2:46:58pm" +#define GIT_COMMIT_HASH "6672464" #define COPYRIGHT_END_YEAR "2023" diff --git a/vs/config_package.h b/vs/config_package.h index 6b81ccfb72c..fe376497815 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 2023.08.15" +#define PACKAGE_STRING "dosbox-x 2023.09.01" #define PACKAGE_TARNAME "dosbox-x" #define PACKAGE_URL "https://dosbox-x.com" -#define PACKAGE_VERSION "2023.08.15" -#define VERSION "2023.08.15" +#define PACKAGE_VERSION "2023.09.01" +#define VERSION "2023.09.01"