From bca23cc676f45dd1029a96d0241b8e73ca608548 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Mon, 12 Jan 2015 00:53:09 +0000 Subject: [PATCH] [loc] add message for dual EFI/BIOS cheat mode * Also update copyright year for about dialog --- res/localization/rufus.loc | 1 + src/license.h | 2 +- src/localization_data.h | 6 ++++++ src/resource.h | 6 +++++- src/rufus.c | 7 +++---- src/rufus.rc | 16 ++++++++-------- src/stdlg.c | 2 +- 7 files changed, 25 insertions(+), 15 deletions(-) diff --git a/res/localization/rufus.loc b/res/localization/rufus.loc index 762474bc..b046ca78 100644 --- a/res/localization/rufus.loc +++ b/res/localization/rufus.loc @@ -462,6 +462,7 @@ t MSG_262 "ISO Support" t MSG_263 "Use PROPER size units" t MSG_264 "Deleting directory '%s'" t MSG_265 "VMWare disk detection" +t MSG_266 "Dual UEFI/BIOS mode" ################################################################################ ############################# TRANSLATOR END COPY ############################## ################################################################################ diff --git a/src/license.h b/src/license.h index 0b20a59d..9797796d 100644 --- a/src/license.h +++ b/src/license.h @@ -1,7 +1,7 @@ /* * Rufus: The Reliable USB Formatting Utility * Licensing Data - * Copyright © 2011-2014 Pete Batard + * Copyright © 2011-2015 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 diff --git a/src/localization_data.h b/src/localization_data.h index 7a208e5c..baf3544a 100644 --- a/src/localization_data.h +++ b/src/localization_data.h @@ -69,6 +69,8 @@ const loc_control_id control_id[] = { LOC_CTRL(IDS_ADVANCED_OPTIONS_GRP), LOC_CTRL(IDC_LOG), LOC_CTRL(IDC_LANG), + LOC_CTRL(IDC_WINDOWS_INSTALL), + LOC_CTRL(IDC_WINDOWS_TO_GO), LOC_CTRL(IDC_LOG_EDIT), LOC_CTRL(IDC_LOG_SAVE), LOC_CTRL(IDC_LOG_CLEAR), @@ -362,6 +364,10 @@ const loc_control_id control_id[] = { LOC_CTRL(MSG_263), LOC_CTRL(MSG_264), LOC_CTRL(MSG_265), + LOC_CTRL(MSG_266), + LOC_CTRL(MSG_267), + LOC_CTRL(MSG_268), + LOC_CTRL(MSG_269), LOC_CTRL(MSG_MAX), LOC_CTRL(IDOK), LOC_CTRL(IDCANCEL), diff --git a/src/resource.h b/src/resource.h index 4348ec48..1910b489 100644 --- a/src/resource.h +++ b/src/resource.h @@ -400,7 +400,11 @@ #define MSG_263 3263 #define MSG_264 3264 #define MSG_265 3265 -#define MSG_MAX 3266 +#define MSG_266 3266 +#define MSG_267 3267 +#define MSG_268 3268 +#define MSG_269 3269 +#define MSG_MAX 3270 // Next default values for new objects // diff --git a/src/rufus.c b/src/rufus.c index af7afa3c..238012b3 100644 --- a/src/rufus.c +++ b/src/rufus.c @@ -158,8 +158,8 @@ static int nb_slots[OP_MAX]; static float slot_end[OP_MAX+1]; // shifted +1 so that we can subtract 1 to OP indexes static float previous_end; -// TODO: Remember to update copyright year in both license.h and the RC when the year changes! -// Also localization_data.sh +// TODO: Remember to update copyright year in stdlg's AboutCallback() WM_INITDIALOG, +// localization_data.sh and the .rc when the year changes! #define KB 1024LL #define MB 1048576LL @@ -2591,8 +2591,7 @@ relaunch: // Alt-E => Enhanced installation mode (allow dual UEFI/BIOS mode and FAT32 for Windows) if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'E')) { allow_dual_uefi_bios = !allow_dual_uefi_bios; - // TODO: add a localized message - PrintStatus2000("Allow dual UEFI/BIOS mode", allow_dual_uefi_bios); + PrintStatus2000(lmprintf(MSG_266), allow_dual_uefi_bios); continue; } // Alt-F => Toggle detection of USB HDDs diff --git a/src/rufus.rc b/src/rufus.rc index cd7d84c7..30ab74e9 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rufus 2.0.0.570" +CAPTION "Rufus 2.0.0.571" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,127,339,50,14 @@ -157,7 +157,7 @@ END IDD_DIALOG_XP DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rufus 2.0.0.570" +CAPTION "Rufus 2.0.0.571" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,127,339,50,14 @@ -283,7 +283,7 @@ END IDD_DIALOG_RTL DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 2.0.0.570" +CAPTION "Rufus 2.0.0.571" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,127,339,50,14 @@ -415,7 +415,7 @@ END IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 2.0.0.570" +CAPTION "Rufus 2.0.0.571" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,127,339,50,14 @@ -669,8 +669,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,0,570 - PRODUCTVERSION 2,0,0,570 + FILEVERSION 2,0,0,571 + PRODUCTVERSION 2,0,0,571 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -687,13 +687,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "2.0.0.570" + VALUE "FileVersion", "2.0.0.571" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "2.0.0.570" + VALUE "ProductVersion", "2.0.0.571" END END BLOCK "VarFileInfo" diff --git a/src/stdlg.c b/src/stdlg.c index 0ea61db8..01cbeb16 100644 --- a/src/stdlg.c +++ b/src/stdlg.c @@ -522,7 +522,7 @@ INT_PTR CALLBACK AboutCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM lP ShowWindow(GetDlgItem(hDlg, IDC_ABOUT_UPDATES), SW_SHOW); safe_sprintf(about_blurb, sizeof(about_blurb), about_blurb_format, lmprintf(MSG_174), lmprintf(MSG_175, rufus_version[0], rufus_version[1], rufus_version[2], rufus_version[3]), - right_to_left_mode?"Akeo \\\\ Pete Batard 2011-2014 © Copyright":"Copyright © 2011-2014 Pete Batard / Akeo", + right_to_left_mode?"Akeo \\\\ Pete Batard 2011-2015 © Copyright":"Copyright © 2011-2015 Pete Batard / Akeo", lmprintf(MSG_176), lmprintf(MSG_177), lmprintf(MSG_178)); for (i=0; i