nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[loc] flag "Deleting partitions" message as a potential lengthy operation

Browse source 
* Also use this update to factorize all "This may take a while" messages.
This commit is contained in:
Pete Batard 2020-06-03 16:03:20 +01:00
parent ba3665d990
commit 3b327bff83
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
7 changed files with 166 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

4
res/loc/ChangeLog.txt
View file

@ -5,8 +5,10 @@ To edit a translation, please make sure to follow:
https://github.com/pbatard/rufus/wiki/Localization#Editing_an_existing_translation https://github.com/pbatard/rufus/wiki/Localization#Editing_an_existing_translation
Or simply download https://rufus-web.akeo.ie/locale/pollock.exe and follow its directions. Or simply download https://rufus-web.akeo.ie/locale/pollock.exe and follow its directions.
o v3.? o v3.*
- *UPDATED* MSG_068 "Error while partitioning drive." -> "Could not partition drive." - *UPDATED* MSG_068 "Error while partitioning drive." -> "Could not partition drive."
You can test this new message with <Alt>-<G>
- *NEW* MSG_308 "VHD detection"
o v3.5 (2019.03.12) o v3.5 (2019.03.12)
The following 3 messages can be tested by creating a UEFI:NTFS drive in Rufus ('Show advanced drive properties' must be enabled The following 3 messages can be tested by creating a UEFI:NTFS drive in Rufus ('Show advanced drive properties' must be enabled

269
res/loc/rufus.loc
View file

File diff suppressed because it is too large Load diff

2
src/drive.c
View file

@ -1800,7 +1800,7 @@ BOOL InitializeDisk(HANDLE hDrive)
DWORD size; DWORD size;
CREATE_DISK CreateDisk = {PARTITION_STYLE_RAW, {{0}}}; CREATE_DISK CreateDisk = {PARTITION_STYLE_RAW, {{0}}};
PrintInfoDebug(0, MSG_239); uprintf("Initializing disk...");
size = sizeof(CreateDisk); size = sizeof(CreateDisk);
r = DeviceIoControl(hDrive, IOCTL_DISK_CREATE_DISK, r = DeviceIoControl(hDrive, IOCTL_DISK_CREATE_DISK,

4
src/format.c
View file

@ -1779,7 +1779,7 @@ DWORD WINAPI FormatThread(void* param)
// It kind of blows, but we have to relinquish access to the physical drive // It kind of blows, but we have to relinquish access to the physical drive
// for VDS to be able to delete the partitions that reside on it... // for VDS to be able to delete the partitions that reside on it...
safe_unlockclose(hPhysicalDrive); safe_unlockclose(hPhysicalDrive);
PrintInfoDebug(0, MSG_239); PrintInfoDebug(0, MSG_239, lmprintf(MSG_307));
if (!DeletePartitions(DriveIndex)) { if (!DeletePartitions(DriveIndex)) {
SetLastError(FormatStatus); SetLastError(FormatStatus);
uprintf("Notice: Could not delete partitions: %s", WindowsErrorString()); uprintf("Notice: Could not delete partitions: %s", WindowsErrorString());
@ -2162,7 +2162,7 @@ DWORD WINAPI FormatThread(void* param)
} }
// EFI mode selected, with no 'boot###.efi' but Windows 7 x64's 'bootmgr.efi' (bit #0) // EFI mode selected, with no 'boot###.efi' but Windows 7 x64's 'bootmgr.efi' (bit #0)
if (((target_type == TT_UEFI) || allow_dual_uefi_bios) && HAS_WIN7_EFI(img_report)) { if (((target_type == TT_UEFI) || allow_dual_uefi_bios) && HAS_WIN7_EFI(img_report)) {
PrintInfoDebug(0, MSG_232); PrintInfoDebug(0, MSG_232, lmprintf(MSG_307));
img_report.wininst_path[0][0] = drive_name[0]; img_report.wininst_path[0][0] = drive_name[0];
efi_dst[0] = drive_name[0]; efi_dst[0] = drive_name[0];
efi_dst[sizeof(efi_dst) - sizeof("\\bootx64.efi")] = 0; efi_dst[sizeof(efi_dst) - sizeof("\\bootx64.efi")] = 0;

2
src/format_fat32.c
View file

@ -422,7 +422,7 @@ BOOL FormatLargeFAT32(DWORD DriveIndex, uint64_t PartitionOffset, DWORD ClusterS
} }
// Set the FAT32 volume label // Set the FAT32 volume label
PrintInfoDebug(0, MSG_221); PrintInfoDebug(0, MSG_221, lmprintf(MSG_307));
// Handle must be closed for SetVolumeLabel to work // Handle must be closed for SetVolumeLabel to work
safe_closehandle(hLogicalVolume); safe_closehandle(hLogicalVolume);
VolumeName = GetLogicalName(DriveIndex, PartitionOffset, TRUE, TRUE); VolumeName = GetLogicalName(DriveIndex, PartitionOffset, TRUE, TRUE);

2
src/rufus.c
View file

@ -3397,7 +3397,7 @@ relaunch:
if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'G')) { if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'G')) {
enable_VHDs = !enable_VHDs; enable_VHDs = !enable_VHDs;
WriteSettingBool(SETTING_DISABLE_VHDS, !enable_VHDs); WriteSettingBool(SETTING_DISABLE_VHDS, !enable_VHDs);
PrintStatusTimeout(lmprintf(MSG_307), enable_VHDs); PrintStatusTimeout(lmprintf(MSG_308), enable_VHDs);
GetDevices(0); GetDevices(0);
continue; continue;
} }

10
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 232, 326 IDD_DIALOG DIALOGEX 12, 12, 232, 326
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 3.11.1663" CAPTION "Rufus 3.11.1664"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -395,8 +395,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,11,1663,0 FILEVERSION 3,11,1664,0
PRODUCTVERSION 3,11,1663,0 PRODUCTVERSION 3,11,1664,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -414,13 +414,13 @@ BEGIN
VALUE "Comments", "https://rufus.ie" VALUE "Comments", "https://rufus.ie"
VALUE "CompanyName", "Akeo Consulting" VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.11.1663" VALUE "FileVersion", "3.11.1664"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2020 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2020 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
VALUE "OriginalFilename", "rufus-3.11.exe" VALUE "OriginalFilename", "rufus-3.11.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.11.1663" VALUE "ProductVersion", "3.11.1664"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"