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

[format] existing volumes with the name "New Volume" should be renamed

Browse source 
* Closes #104
This commit is contained in:
Pete Batard 2013-10-31 23:16:44 +00:00
parent 59496e53c0
commit c44fa3969d
5 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
res/localization/ChangeLog.txt
View file

@ -12,7 +12,7 @@ o Version 1.0.2 (2013.10.30)
- *NEW* MSG_112 "Formatting a large UDF volumes can take a lot of time..." - *NEW* MSG_112 "Formatting a large UDF volumes can take a lot of time..."
- *NEW* MSG_113 "Large UDF volume" - *NEW* MSG_113 "Large UDF volume"
- *NEW* MSG_220 "Formatting (%s) - estimated duration %d:%02d..." - *NEW* MSG_220 "Formatting (%s) - estimated duration %d:%02d..."
- [ANOTHER MESSAGE TO FOLLOW] - *NEW* MSG_207 "New Volume"
o Version 1.0.1 (2013.10.28) o Version 1.0.1 (2013.10.28)
- MSG_061 "Please insert a media in drive." -> "Please insert a removable media in drive." - MSG_061 "Please insert a media in drive." -> "Please insert a removable media in drive."
- MSG_071 "Unable to create formatting thread." -> "Unable to start thread." - MSG_071 "Unable to create formatting thread." -> "Unable to start thread."

3
res/localization/new_translation.loc
View file

@ -345,6 +345,9 @@ t MSG_204 "Obsolete %s detected"
t MSG_205 "Using ISO: %s" t MSG_205 "Using ISO: %s"
# Typically "Missing ldlinux.c32 file" # Typically "Missing ldlinux.c32 file"
t MSG_206 "Missing %s file" t MSG_206 "Missing %s file"
# The name proposed by Windows' Computer Management -> Disk Management when you try to format a drive
# with an empty label. See http://rufus.akeo.ie/pics/default_name.png
t MSG_207 "New Volume"
# Same message, once for singular and plural ("1 device found", "2 devices found") # Same message, once for singular and plural ("1 device found", "2 devices found")
t MSG_208 "%d device found" t MSG_208 "%d device found"
t MSG_209 "%d devices found" t MSG_209 "%d devices found"

4
res/localization/rufus.loc
View file

@ -219,6 +219,9 @@ t MSG_204 "Obsolete %s detected"
t MSG_205 "Using ISO: %s" t MSG_205 "Using ISO: %s"
# Typically "Missing ldlinux.c32 file" # Typically "Missing ldlinux.c32 file"
t MSG_206 "Missing %s file" t MSG_206 "Missing %s file"
# The name proposed by Windows' Computer Management -> Disk Management when you try to format a drive
# with an empty label. See http://rufus.akeo.ie/pics/default_name.png
t MSG_207 "New Volume"
# Same message, once for singular and plural ("1 device found", "2 devices found") # Same message, once for singular and plural ("1 device found", "2 devices found")
t MSG_208 "%d device found" t MSG_208 "%d device found"
t MSG_209 "%d devices found" t MSG_209 "%d devices found"
@ -657,6 +660,7 @@ t MSG_203 "Echec d'analyse de l'image ISO"
t MSG_204 "Fichier %s obsolète detecté" t MSG_204 "Fichier %s obsolète detecté"
t MSG_205 "ISO utilisée: %s" t MSG_205 "ISO utilisée: %s"
t MSG_206 "Fichier %s manquant" t MSG_206 "Fichier %s manquant"
t MSG_207 "Nouveau volume"
t MSG_208 "%d périphérique détecté" t MSG_208 "%d périphérique détecté"
t MSG_209 "%d périphériques détectés" t MSG_209 "%d périphériques détectés"
t MSG_210 "Opération terminée." t MSG_210 "Opération terminée."

3
src/rufus.c
View file

@ -572,7 +572,8 @@ static BOOL PopulateProperties(int ComboIndex)
// If no existing label is available and no ISO is selected, propose one according to the size (eg: "256MB", "8GB") // If no existing label is available and no ISO is selected, propose one according to the size (eg: "256MB", "8GB")
if ((iso_path == NULL) || (iso_report.label[0] == 0)) { if ((iso_path == NULL) || (iso_report.label[0] == 0)) {
if (safe_strcmp(no_label, DriveLabel.Table[ComboIndex]) == 0) { if ( (safe_stricmp(no_label, DriveLabel.Table[ComboIndex]) == 0)
|| (safe_stricmp(lmprintf(MSG_207), DriveLabel.Table[ComboIndex]) == 0) ) {
SetWindowTextU(hLabel, SelectedDrive.proposed_label); SetWindowTextU(hLabel, SelectedDrive.proposed_label);
} else { } else {
SetWindowTextU(hLabel, DriveLabel.Table[ComboIndex]); SetWindowTextU(hLabel, DriveLabel.Table[ComboIndex]);

10
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 206, 329 IDD_DIALOG DIALOGEX 12, 12, 206, 329
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_APPWINDOW EXSTYLE WS_EX_APPWINDOW
CAPTION "Rufus v1.4.0.302" CAPTION "Rufus v1.4.0.303"
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN BEGIN
DEFPUSHBUTTON "Start",IDC_START,94,291,50,14 DEFPUSHBUTTON "Start",IDC_START,94,291,50,14
@ -285,8 +285,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,4,0,302 FILEVERSION 1,4,0,303
PRODUCTVERSION 1,4,0,302 PRODUCTVERSION 1,4,0,303
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -303,13 +303,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", "1.4.0.302" VALUE "FileVersion", "1.4.0.303"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2013 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2013 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", "1.4.0.302" VALUE "ProductVersion", "1.4.0.303"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"