From 70e87482c1f5c0058c64e0f7e60f51551886b6f1 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Wed, 10 Jan 2024 12:53:07 +0000 Subject: [PATCH] [misc] add some more Windows edition names * Closes #2380 * Also fix a typo in the Norwegian translation, with thanks to @Legendarion * Closes #2397 --- res/loc/po/nb-NO.po | 6 +++--- res/loc/rufus.loc | 2 +- src/rufus.rc | 10 +++++----- src/stdfn.c | 14 +++++++++++--- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/res/loc/po/nb-NO.po b/res/loc/po/nb-NO.po index bb19d079..263f6801 100644 --- a/res/loc/po/nb-NO.po +++ b/res/loc/po/nb-NO.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: 3.22\n" "Report-Msgid-Bugs-To: pete@akeo.ie\n" "POT-Creation-Date: 2023-04-17 13:44+0100\n" -"PO-Revision-Date: 2023-04-17 13:46+0100\n" +"PO-Revision-Date: 2024-01-10 12:20+0000\n" "Last-Translator: \n" "Language-Team: \n" "Language: nb_NO\n" @@ -13,7 +13,7 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" "X-Rufus-LanguageName: Norwegian (Norsk)\n" "X-Rufus-LCID: 0x0414\n" -"X-Generator: Poedit 3.2.2\n" +"X-Generator: Poedit 3.4.2\n" #. • IDD_DIALOG → IDS_DRIVE_PROPERTIES_TXT msgid "Drive Properties" @@ -803,7 +803,7 @@ msgstr "" #. • MSG_117 msgid "Standard Windows installation" -msgstr "Standard Windows instalasjon" +msgstr "Standard Windows installasjon" #. • MSG_118 #. diff --git a/res/loc/rufus.loc b/res/loc/rufus.loc index 2fc43bf6..4bb45c9d 100644 --- a/res/loc/rufus.loc +++ b/res/loc/rufus.loc @@ -9365,7 +9365,7 @@ t MSG_113 "Stort UDF-volum" t MSG_114 "Dette bildet bruker Syslinux %s%s men dette programmet inkluderer kun installsjonsfiler for Syslinux %s%s.\n\nNye versjoner av Syslinux er ikke kompatible med hverandre, og dermed ikke mulig for Rufus Ã¥ inkludere alle, 2 ekstra filer mÃ¥ lastes ned fra Internett ('ldlinux.sys' og 'ldlinux.bss'):\n- Velg 'Ja' For Ã¥ koble til internett og laste ned disse filene\n- Velg 'Nei' for Ã¥ avbryte\n\nOBS: Filene vil bli lastet ned i det aktuelle programmets mappe og vil bli brukt automatisk hvis de er tilstede." t MSG_115 "Nedlasting pÃ¥krevd" t MSG_116 "Dette bildet bruker Grub %s, men programmet inkluderer kun installasjonsfiler forGrub %s.\n\nForskjellige versjoner av Grub er muligens ikke kompatible med hverandre, og er ikke mulig Ã¥ inkludere dem alle, Rufus vil prøve Ã¥ finne en versjon av Grub installasjonfilen ('core.img') som passer til ditt bilde:\n- Velg 'Ja' for Ã¥ koble til internett og forsøke Ã¥ laste den ned\n- Velg 'Nei' for Ã¥ bruke den innebygde versjonen uansett\n- Velg 'Avbryt' for Ã¥ avbryte\n\nOBS: Filen vil bli lastet ned i den aktuelle program-mappen og vil bli brukt automatisk hvis tilgjengelig. Hvis ingen treff kan bli funnet, den innebygde versjonen vil bli brukt." -t MSG_117 "Standard Windows instalasjon" +t MSG_117 "Standard Windows installasjon" t MSG_119 "avanserte stasjonsegenskaper" t MSG_120 "avanserte formatalternativer" t MSG_121 "Vis %s" diff --git a/src/rufus.rc b/src/rufus.rc index f51b008f..0402b6f5 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 4.4.2097" +CAPTION "Rufus 4.4.2098" FONT 9, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP @@ -392,8 +392,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,4,2097,0 - PRODUCTVERSION 4,4,2097,0 + FILEVERSION 4,4,2098,0 + PRODUCTVERSION 4,4,2098,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -411,13 +411,13 @@ BEGIN VALUE "Comments", "https://rufus.ie" VALUE "CompanyName", "Akeo Consulting" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "4.4.2097" + VALUE "FileVersion", "4.4.2098" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2024 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" VALUE "OriginalFilename", "rufus-4.4.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "4.4.2097" + VALUE "ProductVersion", "4.4.2098" END END BLOCK "VarFileInfo" diff --git a/src/stdfn.c b/src/stdfn.c index d4076364..f23019c0 100644 --- a/src/stdfn.c +++ b/src/stdfn.c @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * Standard Windows function calls - * Copyright © 2013-2023 Pete Batard + * Copyright © 2013-2024 Pete Batard * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -302,10 +302,18 @@ static const char* GetEdition(DWORD ProductType) case 0x000000A5: return "Pro for Education N"; case 0x000000AB: return "Enterprise G"; // I swear Microsoft are just making up editions... case 0x000000AC: return "Enterprise G N"; + case 0x000000B2: return "Cloud"; + case 0x000000B3: return "Cloud N"; case 0x000000B6: return "Home OS"; - case 0x000000B7: return "Cloud E"; - case 0x000000B8: return "Cloud E N"; + case 0x000000B7: case 0x000000CB: return "Cloud E"; + case 0x000000B9: return "IoT OS"; + case 0x000000BA: case 0x000000CA: return "Cloud E N"; + case 0x000000BB: return "IoT Edge OS"; + case 0x000000BC: return "IoT Enterprise"; case 0x000000BD: return "Lite"; + case 0x000000BF: return "IoT Enterprise S"; + case 0x000000C0: case 0x000000C2: case 0x000000C3: case 0x000000C4: case 0x000000C5: case 0x000000C6: return "XBox"; + case 0x000000C7: case 0x000000C8: case 0x00000196: case 0x00000197: case 0x00000198: return "Azure Server"; case 0xABCDABCD: return "(Unlicensed)"; default: static_sprintf(unknown_edition_str, "(Unknown Edition 0x%02X)", (uint32_t)ProductType);