1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00

[loc] add new message for listing of non-USB removable drives

* Also increase status display timeout for cheat modes
This commit is contained in:
Pete Batard 2016-05-09 13:40:54 +01:00
parent 8bd9055d6c
commit f65dbb11c0
5 changed files with 36 additions and 27 deletions

View file

@ -15,6 +15,11 @@ content. PLEASE, do not just look at this Changelog when updating your
translation, but always use the English section of rufus.loc as your base. translation, but always use the English section of rufus.loc as your base.
For instance, MSG_114, that was introduced in v1.0.8 is MORE than one line! For instance, MSG_114, that was introduced in v1.0.8 is MORE than one line!
o Version 1.0.20 (2016.05.09)
- *NEW* MSG_287 "Detection of non-USB removable drives"
Note, this message is followed by either "enabled"/"disabled" (see MSG_250/251) and is similar to MSG_253
The message appears on the status bar and can be tested with Ctrl-Alt-F.
o Version 1.0.19 (2015.10.15) o Version 1.0.19 (2015.10.15)
Note: The following message can be tested by pressing Alt-, (That's the 'Alt' and 'comma' keys on your keyboard) Note: The following message can be tested by pressing Alt-, (That's the 'Alt' and 'comma' keys on your keyboard)
In case the message below is not clear, you can consider that it says "Exclusive locking of the USB drive" In case the message below is not clear, you can consider that it says "Exclusive locking of the USB drive"

View file

@ -92,7 +92,7 @@
# http://download.microsoft.com/download/9/5/E/95EF66AF-9026-4BB0-A41D-A4F81802D92C/%5BMS-LCID%5D.pdf # http://download.microsoft.com/download/9/5/E/95EF66AF-9026-4BB0-A41D-A4F81802D92C/%5BMS-LCID%5D.pdf
# for the LCID (0x####) codes you should use # for the LCID (0x####) codes you should use
l "en-US" "English (English)" 0x0409, 0x0809, 0x0c09, 0x1009, 0x1409, 0x1809, 0x1c09, 0x2009, 0x2409, 0x2809, 0x2c09, 0x3009, 0x3409, 0x3809, 0x3c09, 0x4009, 0x4409, 0x4809 l "en-US" "English (English)" 0x0409, 0x0809, 0x0c09, 0x1009, 0x1409, 0x1809, 0x1c09, 0x2009, 0x2409, 0x2809, 0x2c09, 0x3009, 0x3409, 0x3809, 0x3c09, 0x4009, 0x4409, 0x4809
v 1.0.19 v 1.0.20
# Main dialog # Main dialog
g IDD_DIALOG g IDD_DIALOG
@ -548,6 +548,7 @@ t MSG_284 "The downloaded executable is missing a digital signature."
t MSG_285 "The downloaded executable is signed by '%s'.\nThis is not a signature we recognize and could " t MSG_285 "The downloaded executable is signed by '%s'.\nThis is not a signature we recognize and could "
"indicate some form of malicious activity...\nAre you sure you want to run this file?" "indicate some form of malicious activity...\nAre you sure you want to run this file?"
t MSG_286 "Zeroing drive: %0.1f%% completed" t MSG_286 "Zeroing drive: %0.1f%% completed"
t MSG_287 "Detection of non-USB removable drives"
################################################################################ ################################################################################
############################# TRANSLATOR END COPY ############################## ############################# TRANSLATOR END COPY ##############################
@ -5033,7 +5034,7 @@ t MSG_285 "Ladatun tiedoston on allekirjoittanut '%s'.\nEmme tunnista kyseistä
################################################################################ ################################################################################
l "fr-FR" "French (Français)" 0x040c, 0x080c, 0x0c0c, 0x100c, 0x140c, 0x180c, 0x1c0c, 0x200c, 0x240c, 0x280c, 0x2c0c, 0x300c, 0x340c, 0x380c, 0xe40c l "fr-FR" "French (Français)" 0x040c, 0x080c, 0x0c0c, 0x100c, 0x140c, 0x180c, 0x1c0c, 0x200c, 0x240c, 0x280c, 0x2c0c, 0x300c, 0x340c, 0x380c, 0xe40c
v 1.0.19 v 1.0.20
b "en-US" b "en-US"
g IDD_DIALOG g IDD_DIALOG
@ -5449,6 +5450,7 @@ t MSG_283 "Signature invalide"
t MSG_284 "L'exécutable téléchargé ne possède pas de signature digitale." t MSG_284 "L'exécutable téléchargé ne possède pas de signature digitale."
t MSG_285 "L'exécutable téléchargé est signé par '%s'.\nCe nest pas une signature que nous reconnaissons et " t MSG_285 "L'exécutable téléchargé est signé par '%s'.\nCe nest pas une signature que nous reconnaissons et "
"pourrait indiquer une activité malicieuse...\nÊtes-vous certain de vouloir lancer ce fichier?" "pourrait indiquer une activité malicieuse...\nÊtes-vous certain de vouloir lancer ce fichier?"
t MSG_287 "Détection disques non-USB détachables"
################################################################################ ################################################################################
l "de-DE" "German (Deutsch)" 0x0407, 0x0807, 0x0c07, 0x1007, 0x1407 l "de-DE" "German (Deutsch)" 0x0407, 0x0807, 0x0c07, 0x1007, 0x1407

View file

@ -1889,9 +1889,9 @@ void InitDialog(HWND hDlg)
PrintInfo(0, MSG_210); PrintInfo(0, MSG_210);
} }
static void PrintStatus2000(const char* str, BOOL val) static void PrintStatusTimeout(const char* str, BOOL val)
{ {
PrintStatus(2000, (val)?MSG_250:MSG_251, str); PrintStatus(STATUS_MSG_TIMEOUT, (val)?MSG_250:MSG_251, str);
} }
void ShowLanguageMenu(RECT rcExclude) void ShowLanguageMenu(RECT rcExclude)
@ -2428,7 +2428,7 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
case IDC_ENABLE_FIXED_DISKS: case IDC_ENABLE_FIXED_DISKS:
if ((HIWORD(wParam)) == BN_CLICKED) { if ((HIWORD(wParam)) == BN_CLICKED) {
enable_HDDs = !enable_HDDs; enable_HDDs = !enable_HDDs;
PrintStatus2000(lmprintf(MSG_253), enable_HDDs); PrintStatusTimeout(lmprintf(MSG_253), enable_HDDs);
GetDevices(0); GetDevices(0);
} }
break; break;
@ -3072,14 +3072,14 @@ relaunch:
if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == VK_OEM_PERIOD)) { if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == VK_OEM_PERIOD)) {
usb_debug = !usb_debug; usb_debug = !usb_debug;
WriteSettingBool(SETTING_ENABLE_USB_DEBUG, usb_debug); WriteSettingBool(SETTING_ENABLE_USB_DEBUG, usb_debug);
PrintStatus2000(lmprintf(MSG_270), usb_debug); PrintStatusTimeout(lmprintf(MSG_270), usb_debug);
GetDevices(0); GetDevices(0);
continue; continue;
} }
// Alt-, => Disable physical drive locking // Alt-, => Disable physical drive locking
if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == VK_OEM_COMMA)) { if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == VK_OEM_COMMA)) {
lock_drive = !lock_drive; lock_drive = !lock_drive;
PrintStatus2000(lmprintf(MSG_282), lock_drive); PrintStatusTimeout(lmprintf(MSG_282), lock_drive);
continue; continue;
} }
// Alt-B => Toggle fake drive detection during bad blocks check // Alt-B => Toggle fake drive detection during bad blocks check
@ -3090,7 +3090,7 @@ relaunch:
if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'B')) { if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'B')) {
detect_fakes = !detect_fakes; detect_fakes = !detect_fakes;
WriteSettingBool(SETTING_DISABLE_FAKE_DRIVES_CHECK, !detect_fakes); WriteSettingBool(SETTING_DISABLE_FAKE_DRIVES_CHECK, !detect_fakes);
PrintStatus2000(lmprintf(MSG_256), detect_fakes); PrintStatusTimeout(lmprintf(MSG_256), detect_fakes);
continue; continue;
} }
// Alt C => Force the update check to be successful // Alt C => Force the update check to be successful
@ -3098,7 +3098,7 @@ relaunch:
// check, so that it always succeeds. This is useful for translators. // check, so that it always succeeds. This is useful for translators.
if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'C')) { if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'C')) {
force_update = !force_update; force_update = !force_update;
PrintStatus2000(lmprintf(MSG_259), force_update); PrintStatusTimeout(lmprintf(MSG_259), force_update);
continue; continue;
} }
// Alt-D => Delete the NoDriveTypeAutorun key on exit (useful if the app crashed) // Alt-D => Delete the NoDriveTypeAutorun key on exit (useful if the app crashed)
@ -3112,7 +3112,7 @@ relaunch:
if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'E')) { if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'E')) {
allow_dual_uefi_bios = !allow_dual_uefi_bios; allow_dual_uefi_bios = !allow_dual_uefi_bios;
WriteSettingBool(SETTING_ENABLE_WIN_DUAL_EFI_BIOS, allow_dual_uefi_bios); WriteSettingBool(SETTING_ENABLE_WIN_DUAL_EFI_BIOS, allow_dual_uefi_bios);
PrintStatus2000(lmprintf(MSG_266), allow_dual_uefi_bios); PrintStatusTimeout(lmprintf(MSG_266), allow_dual_uefi_bios);
SetMBRForUEFI(TRUE); SetMBRForUEFI(TRUE);
continue; continue;
} }
@ -3122,7 +3122,7 @@ relaunch:
// When enabled, Rufus will list and allow the formatting of USB HDDs. // When enabled, Rufus will list and allow the formatting of USB HDDs.
if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'F')) { if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'F')) {
enable_HDDs = !enable_HDDs; enable_HDDs = !enable_HDDs;
PrintStatus2000(lmprintf(MSG_253), enable_HDDs); PrintStatusTimeout(lmprintf(MSG_253), enable_HDDs);
GetDevices(0); GetDevices(0);
CheckDlgButton(hMainDialog, IDC_ENABLE_FIXED_DISKS, enable_HDDs?BST_CHECKED:BST_UNCHECKED); CheckDlgButton(hMainDialog, IDC_ENABLE_FIXED_DISKS, enable_HDDs?BST_CHECKED:BST_UNCHECKED);
continue; continue;
@ -3132,7 +3132,7 @@ relaunch:
// DD-mode when writing the data. // DD-mode when writing the data.
if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'I')) { if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'I')) {
enable_iso = !enable_iso; enable_iso = !enable_iso;
PrintStatus2000(lmprintf(MSG_262), enable_iso); PrintStatusTimeout(lmprintf(MSG_262), enable_iso);
if (image_path != NULL) { if (image_path != NULL) {
iso_provided = TRUE; iso_provided = TRUE;
dont_display_image_name = TRUE; dont_display_image_name = TRUE;
@ -3146,27 +3146,27 @@ relaunch:
// a file name). This option allows users to ignore Joliet when using such images. // a file name). This option allows users to ignore Joliet when using such images.
if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'J')) { if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'J')) {
enable_joliet = !enable_joliet; enable_joliet = !enable_joliet;
PrintStatus2000(lmprintf(MSG_257), enable_joliet); PrintStatusTimeout(lmprintf(MSG_257), enable_joliet);
continue; continue;
} }
// Alt K => Toggle Rock Ridge support for ISO9660 images // Alt K => Toggle Rock Ridge support for ISO9660 images
if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'K')) { if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'K')) {
enable_rockridge = !enable_rockridge; enable_rockridge = !enable_rockridge;
PrintStatus2000(lmprintf(MSG_258), enable_rockridge); PrintStatusTimeout(lmprintf(MSG_258), enable_rockridge);
continue; continue;
} }
// Alt-L => Force Large FAT32 format to be used on < 32 GB drives // Alt-L => Force Large FAT32 format to be used on < 32 GB drives
if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'L')) { if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'L')) {
force_large_fat32 = !force_large_fat32; force_large_fat32 = !force_large_fat32;
WriteSettingBool(SETTING_FORCE_LARGE_FAT32_FORMAT, force_large_fat32); WriteSettingBool(SETTING_FORCE_LARGE_FAT32_FORMAT, force_large_fat32);
PrintStatus2000(lmprintf(MSG_254), force_large_fat32); PrintStatusTimeout(lmprintf(MSG_254), force_large_fat32);
GetDevices(0); GetDevices(0);
continue; continue;
} }
// Alt N => Enable NTFS compression // Alt N => Enable NTFS compression
if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'N')) { if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'N')) {
enable_ntfs_compression = !enable_ntfs_compression; enable_ntfs_compression = !enable_ntfs_compression;
PrintStatus2000(lmprintf(MSG_260), enable_ntfs_compression); PrintStatusTimeout(lmprintf(MSG_260), enable_ntfs_compression);
continue; continue;
} }
// Alt-R => Remove all the registry keys that may have been created by Rufus // Alt-R => Remove all the registry keys that may have been created by Rufus
@ -3181,7 +3181,7 @@ relaunch:
// the target USB drive. If this is enabled, the size check is disabled. // the target USB drive. If this is enabled, the size check is disabled.
if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'S')) { if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'S')) {
size_check = !size_check; size_check = !size_check;
PrintStatus2000(lmprintf(MSG_252), size_check); PrintStatusTimeout(lmprintf(MSG_252), size_check);
GetDevices(0); GetDevices(0);
continue; continue;
} }
@ -3189,14 +3189,14 @@ relaunch:
if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'T')) { if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'T')) {
preserve_timestamps = !preserve_timestamps; preserve_timestamps = !preserve_timestamps;
WriteSettingBool(SETTING_PRESERVE_TIMESTAMPS, preserve_timestamps); WriteSettingBool(SETTING_PRESERVE_TIMESTAMPS, preserve_timestamps);
PrintStatus2000(lmprintf(MSG_269), preserve_timestamps); PrintStatusTimeout(lmprintf(MSG_269), preserve_timestamps);
continue; continue;
} }
// Alt-U => Use PROPER size units, instead of this whole Kibi/Gibi nonsense // Alt-U => Use PROPER size units, instead of this whole Kibi/Gibi nonsense
if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'U')) { if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'U')) {
use_fake_units = !use_fake_units; use_fake_units = !use_fake_units;
WriteSettingBool(SETTING_USE_PROPER_SIZE_UNITS, !use_fake_units); WriteSettingBool(SETTING_USE_PROPER_SIZE_UNITS, !use_fake_units);
PrintStatus2000(lmprintf(MSG_263), !use_fake_units); PrintStatusTimeout(lmprintf(MSG_263), !use_fake_units);
GetDevices(0); GetDevices(0);
continue; continue;
} }
@ -3209,7 +3209,7 @@ relaunch:
if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'W')) { if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'W')) {
enable_vmdk = !enable_vmdk; enable_vmdk = !enable_vmdk;
WriteSettingBool(SETTING_ENABLE_VMDK_DETECTION, enable_vmdk); WriteSettingBool(SETTING_ENABLE_VMDK_DETECTION, enable_vmdk);
PrintStatus2000(lmprintf(MSG_265), enable_vmdk); PrintStatusTimeout(lmprintf(MSG_265), enable_vmdk);
GetDevices(0); GetDevices(0);
continue; continue;
} }
@ -3239,8 +3239,9 @@ relaunch:
enable_HDDs = previous_enable_HDDs; enable_HDDs = previous_enable_HDDs;
} }
CheckDlgButton(hMainDialog, IDC_ENABLE_FIXED_DISKS, enable_HDDs ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hMainDialog, IDC_ENABLE_FIXED_DISKS, enable_HDDs ? BST_CHECKED : BST_UNCHECKED);
PrintStatus2000("Listing of non-USB removable drives", list_non_usb_removable_drives); PrintStatusTimeout(lmprintf(MSG_287), list_non_usb_removable_drives);
uprintf("NOTE: Listing of non-USB removable drives has been %s.", (list_non_usb_removable_drives)?"enabled (CAUTION!)":"disabled"); uprintf("%sListing of non-USB removable drives %s",
(list_non_usb_removable_drives)?"CAUTION: ":"", (list_non_usb_removable_drives)?"enabled":"disabled");
if (list_non_usb_removable_drives) if (list_non_usb_removable_drives)
uprintf("By using this unofficial cheat mode you forfeit ANY RIGHT to complain if you lose valuable data!"); uprintf("By using this unofficial cheat mode you forfeit ANY RIGHT to complain if you lose valuable data!");
GetDevices(0); GetDevices(0);

View file

@ -66,6 +66,7 @@
#define MAX_GPT_PARTITIONS 128 #define MAX_GPT_PARTITIONS 128
#define MAX_SECTORS_TO_CLEAR 128 // nb sectors to zap when clearing the MBR/GPT (must be >34) #define MAX_SECTORS_TO_CLEAR 128 // nb sectors to zap when clearing the MBR/GPT (must be >34)
#define MBR_UEFI_MARKER 0x49464555 // 'U', 'E', 'F', 'I', as a 32 bit little endian longword #define MBR_UEFI_MARKER 0x49464555 // 'U', 'E', 'F', 'I', as a 32 bit little endian longword
#define STATUS_MSG_TIMEOUT 3500 // How long should cheat mode messages appear for on the status bar
#define WRITE_RETRIES 3 #define WRITE_RETRIES 3
#define NUM_CHECKSUMS 3 // Number of checksum algorithms we support (MD5, SHA1, SHA256) #define NUM_CHECKSUMS 3 // Number of checksum algorithms we support (MD5, SHA1, SHA256)
#define FS_DEFAULT FS_FAT32 #define FS_DEFAULT FS_FAT32

View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 242, 376 IDD_DIALOG DIALOGEX 12, 12, 242, 376
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 2.9.896" CAPTION "Rufus 2.9.897"
FONT 8, "Segoe UI Symbol", 400, 0, 0x0 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -320,8 +320,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,9,896,0 FILEVERSION 2,9,897,0
PRODUCTVERSION 2,9,896,0 PRODUCTVERSION 2,9,897,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -338,13 +338,13 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "2.9.896" VALUE "FileVersion", "2.9.897"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2016 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2016 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe" VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "2.9.896" VALUE "ProductVersion", "2.9.897"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"