From ae839d96ef5569f4e14da7fd79af0e57e9b7bdf0 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Fri, 12 Aug 2022 11:09:04 +0100 Subject: [PATCH] [appstore] fix invalid country code for Serbia * sr-SR is not a country code that Microsoft accepts (and from what I can see is not valid, because it should be sr-RS). * This has the unfortunate effect of preventing the installation of Rufus from the Windows Store, which fails with error 0x80070057 (Invalid parameter). * Fix this by using a country code for Serbia that Microsoft does accept: sr-Latn-RS * Closes #2015 --- res/appstore/RufusAppxManifest.xml | 2 +- res/appstore/packme.cmd | 4 +++- res/loc/rufus.loc | 4 ++-- src/rufus.rc | 10 +++++----- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/res/appstore/RufusAppxManifest.xml b/res/appstore/RufusAppxManifest.xml index 202b90ef..4a55a70b 100644 --- a/res/appstore/RufusAppxManifest.xml +++ b/res/appstore/RufusAppxManifest.xml @@ -57,7 +57,7 @@ - + diff --git a/res/appstore/packme.cmd b/res/appstore/packme.cmd index 3dd65c9e..095eacd9 100644 --- a/res/appstore/packme.cmd +++ b/res/appstore/packme.cmd @@ -31,8 +31,10 @@ set DEFAULT_SCALE=200 set OTHER_SCALES=100 125 150 400 set SCALED_IMAGES=LargeTile SmallTile Square44x44Logo Square150x150Logo StoreLogo Wide310x150Logo rem All the languages listed below *MUST* match the ones from the Resources section of AppManifest.xml +rem Oh, and these must be *valid* codes that Microsoft accepts, else your users will get an error +rem (that the Microsoft validation and certification process will *NOT* catch) during install. set DEFAULT_LANGUAGE=en-US -set ADDITIONAL_LANGUAGES=ar-SA bg-BG zh-CN zh-TW hr-HR cs-CZ da-DK nl-NL fi-FI fr-FR de-DE el-GR he-IL hu-HU id-ID it-IT ja-JP ko-KR lv-LV lt-LT ms-MY nb-NO fa-IR pl-PL pt-BR pt-PT ro-RO ru-RU sr-SP sk-SK sl-SI es-ES sv-SE th-TH tr-TR uk-UA vi-VN +set ADDITIONAL_LANGUAGES=ar-SA bg-BG zh-CN zh-TW hr-HR cs-CZ da-DK nl-NL fi-FI fr-FR de-DE el-GR he-IL hu-HU id-ID it-IT ja-JP ko-KR lv-LV lt-LT ms-MY nb-NO fa-IR pl-PL pt-BR pt-PT ro-RO ru-RU sr-Latn-RS sk-SK sl-SI es-ES sv-SE th-TH tr-TR uk-UA vi-VN set PACKAGE_IMAGES=^ Square44x44Logo.altform-lightunplated_targetsize-16.png^ Square44x44Logo.altform-lightunplated_targetsize-24.png^ diff --git a/res/loc/rufus.loc b/res/loc/rufus.loc index 02a09f1a..74d3daf0 100644 --- a/res/loc/rufus.loc +++ b/res/loc/rufus.loc @@ -32,7 +32,7 @@ # • v3.14 "pt-PT" "Portuguese Standard (Português)" # • v3.14 "ro-RO" "Romanian (Română)" # • v3.5 "ru-RU" "Russian (Русский)" -# • v3.14 "sr-SP" "Serbian (Srpski)" +# • v3.14 "sr-RS" "Serbian (Srpski)" # • v3.14 "sk-SK" "Slovak (Slovensky)" # • v3.14 "sl-SI" "Slovenian (Slovenščina)" # • v3.14 "es-ES" "Spanish (Español)" @@ -11001,7 +11001,7 @@ t MSG_306 "Быстрое обнуление диска: %s" t MSG_307 "Это может занять время" ######################################################################### -l "sr-SP" "Serbian (Srpski)" 0x241a, 0x081a, 0x181a, 0x2c1a, 0x701a, 0x7c1a +l "sr-RS" "Serbian (Srpski)" 0x241a, 0x081a, 0x181a, 0x2c1a, 0x701a, 0x7c1a v 3.14 b "en-US" diff --git a/src/rufus.rc b/src/rufus.rc index 9765fc40..764f29eb 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 232, 326 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_ACCEPTFILES -CAPTION "Rufus 3.20.1930" +CAPTION "Rufus 3.20.1931" FONT 9, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP @@ -395,8 +395,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,20,1930,0 - PRODUCTVERSION 3,20,1930,0 + FILEVERSION 3,20,1931,0 + PRODUCTVERSION 3,20,1931,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -414,13 +414,13 @@ BEGIN VALUE "Comments", "https://rufus.ie" VALUE "CompanyName", "Akeo Consulting" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "3.20.1930" + VALUE "FileVersion", "3.20.1931" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2022 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" VALUE "OriginalFilename", "rufus-3.20.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "3.20.1930" + VALUE "ProductVersion", "3.20.1931" END END BLOCK "VarFileInfo"