mirrors/rufus
1
0
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2025-05-28 05:34:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

[loc] update translation base to v1.0.12

Browse source 
* Also change UM_ISO_ constants to the more generic UM_PROGRESS_
This commit is contained in:
Pete Batard 2014-05-19 23:25:00 +01:00
parent 420bb1d0d8
commit 9df63b3b2a
12 changed files with 55 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/format.c
View file

@ -145,8 +145,7 @@ static BOOLEAN __stdcall FormatExCallback(FILE_SYSTEM_CALLBACK_COMMAND Command,
break;
case FCC_DEVICE_NOT_READY:
uprintf("The device is not ready");
// TODO: set to ERROR_NOT_READY and add relevant translation
FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|ERROR_ACCESS_DENIED;
FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|ERROR_NOT_READY;
break;
case FCC_CANT_QUICK_FORMAT:
uprintf("Cannot quick format this volume");
@ -1612,7 +1611,7 @@ DWORD WINAPI FormatThread(void* param)
out:
safe_free(guid_volume);
safe_free(buffer);
SendMessage(hISOProgressDlg, UM_ISO_EXIT, 0, 0);
SendMessage(hISOProgressDlg, UM_PROGRESS_EXIT, 0, 0);
safe_closehandle(hSourceImage);
safe_unlockclose(hLogicalVolume);
safe_unlockclose(hPhysicalDrive); // This can take a while

4
src/iso.c
View file

@ -521,7 +521,7 @@ BOOL ExtractISO(const char* src_iso, const char* dest_dir, BOOL scan)
SetWindowLong(hISOProgressBar, GWL_STYLE, progress_style & (~PBS_MARQUEE));
SendMessage(hISOProgressBar, PBM_SETPOS, 0, 0);
}
SendMessage(hISOProgressDlg, UM_ISO_INIT, 0, 0);
SendMessage(hISOProgressDlg, UM_PROGRESS_INIT, 0, 0);
/* First try to open as UDF - fallback to ISO if it failed */
p_udf = udf_open(src_iso);
@ -686,7 +686,7 @@ out:
if (fd != NULL)
fclose(fd);
}
SendMessage(hISOProgressDlg, UM_ISO_EXIT, 0, 0);
SendMessage(hISOProgressDlg, UM_PROGRESS_EXIT, 0, 0);
if (p_iso != NULL)
iso9660_close(p_iso);
if (p_udf != NULL)

2
src/localization_data.h
View file

@ -360,6 +360,8 @@ const loc_control_id control_id[] = {
LOC_CTRL(MSG_259),
LOC_CTRL(MSG_260),
LOC_CTRL(MSG_261),
LOC_CTRL(MSG_262),
LOC_CTRL(MSG_263),
LOC_CTRL(MSG_MAX),
LOC_CTRL(IDOK),
LOC_CTRL(IDCANCEL),

4
src/net.c
View file

@ -263,7 +263,7 @@ DWORD DownloadFile(const char* url, const char* file, HWND hProgressDialog)
SetWindowLong(hProgressBar, GWL_STYLE, progress_style & (~PBS_MARQUEE));
SendMessage(hProgressBar, PBM_SETPOS, 0, 0);
}
SendMessage(hProgressDialog, UM_ISO_INIT, 0, 0);
SendMessage(hProgressDialog, UM_PROGRESS_INIT, 0, 0);
}
for (last_slash = safe_strlen(file); last_slash != 0; last_slash--) {
@ -369,7 +369,7 @@ DWORD DownloadFile(const char* url, const char* file, HWND hProgressDialog)
out:
if (hProgressDialog != NULL)
SendMessage(hProgressDialog, UM_ISO_EXIT, (WPARAM)r, 0);
SendMessage(hProgressDialog, UM_PROGRESS_EXIT, (WPARAM)r, 0);
if (fd != NULL) fclose(fd);
if (!r) {
_unlink(file);

4
src/resource.h
View file

@ -379,7 +379,9 @@
#define MSG_259 3259
#define MSG_260 3260
#define MSG_261 3261
#define MSG_MAX 3262
#define MSG_262 3262
#define MSG_263 3263
#define MSG_MAX 3264
// Next default values for new objects
//

18
src/rufus.c
View file

@ -871,14 +871,14 @@ BOOL CALLBACK ISOProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
// Use maximum granularity for the progress bar
SendMessage(hISOProgressBar, PBM_SETRANGE, 0, (MAX_PROGRESS<<16) & 0xFFFF0000);
return TRUE;
case UM_ISO_INIT:
case UM_PROGRESS_INIT:
iso_op_in_progress = TRUE;
EnableWindow(GetDlgItem(hISOProgressDlg, IDC_ISO_ABORT), TRUE);
CenterDialog(hDlg);
ShowWindow(hDlg, SW_SHOW);
UpdateWindow(hDlg);
return TRUE;
case UM_ISO_EXIT:
case UM_PROGRESS_EXIT:
// Just hide and recenter the dialog
ShowWindow(hDlg, SW_HIDE);
iso_op_in_progress = FALSE;
@ -948,7 +948,7 @@ DWORD WINAPI ISOScanThread(LPVOID param)
r = ExtractISO(iso_path, "", TRUE) || IsImage(iso_path);
EnableControls(TRUE);
if (!r) {
SendMessage(hISOProgressDlg, UM_ISO_EXIT, 0, 0);
SendMessage(hISOProgressDlg, UM_PROGRESS_EXIT, 0, 0);
PrintStatus(0, TRUE, MSG_203);
safe_free(iso_path);
goto out;
@ -1001,7 +1001,7 @@ DWORD WINAPI ISOScanThread(LPVOID param)
}
out:
SendMessage(hISOProgressDlg, UM_ISO_EXIT, 0, 0);
SendMessage(hISOProgressDlg, UM_PROGRESS_EXIT, 0, 0);
ExitThread(0);
}
@ -1141,7 +1141,7 @@ static BOOL BootCheck(void)
return FALSE;
} else if ((fs == FS_FAT16) && (iso_report.has_kolibrios)) {
// KolibriOS doesn't support FAT16
MessageBoxU(hMainDialog, "This ISO is not compatible with the selected filesystem", lmprintf(MSG_099), MB_OK|MB_ICONERROR|MB_IS_RTL);
MessageBoxU(hMainDialog, lmprintf(MSG_189), lmprintf(MSG_099), MB_OK|MB_ICONERROR|MB_IS_RTL);
return FALSE;
} else if (((fs == FS_FAT16)||(fs == FS_FAT32)) && (!HAS_SYSLINUX(iso_report)) &&
(!IS_REACTOS(iso_report)) && (!iso_report.has_kolibrios)) {
@ -1591,7 +1591,7 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
ulRegister = pfSHChangeNotifyRegister(hDlg, 0x0001|0x0002|0x8000,
SHCNE_MEDIAINSERTED|SHCNE_MEDIAREMOVED, UM_MEDIA_CHANGE, 1, &NotifyEntry);
}
PostMessage(hMainDialog, UM_ISO_CREATE, 0, 0);
PostMessage(hMainDialog, UM_PROGRESS_CREATE, 0, 0);
return (INT_PTR)TRUE;
// The things one must do to get an ellipsis on the status bar...
@ -1941,7 +1941,7 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
PostQuitMessage(0);
break;
case UM_ISO_CREATE:
case UM_PROGRESS_CREATE:
// You'd think that Windows would let you instantiate a modeless dialog wherever
// but you'd be wrong. It must be done in the main callback, hence the custom message.
if (!IsWindow(hISOProgressDlg)) {
@ -2281,7 +2281,7 @@ relaunch:
// DD-mode when writing the data.
if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'I')) {
enable_iso = !enable_iso;
PrintStatus2000("ISO support", enable_iso);
PrintStatus2000(lmprintf(MSG_262), enable_iso);
if (iso_path != NULL) {
iso_provided = TRUE;
PostMessage(hDlg, WM_COMMAND, IDC_SELECT_ISO, 0);
@ -2335,7 +2335,7 @@ relaunch:
// Alt-U => Use PROPER size units, instead of this whole Kibi/Gibi nonsense
if ((msg.message == WM_SYSKEYDOWN) && (msg.wParam == 'U')) {
use_fake_units = !use_fake_units;
PrintStatus2000("Use PROPER size units", !use_fake_units);
PrintStatus2000(lmprintf(MSG_263), !use_fake_units);
GetUSBDevices(0);
continue;
}

7
src/rufus.h
View file

@ -121,10 +121,9 @@ extern void _uprintf(const char *format, ...);
enum user_message_type {
UM_FORMAT_COMPLETED = WM_APP,
UM_MEDIA_CHANGE,
// TODO: relabel "ISO" to a more generic "progress"
UM_ISO_CREATE,
UM_ISO_INIT,
UM_ISO_EXIT,
UM_PROGRESS_CREATE,
UM_PROGRESS_INIT,
UM_PROGRESS_EXIT,
// Start of the WM IDs for the language menu items
UM_LANGUAGE_MENU = WM_APP + 0x100
};

12
src/rufus.rc
View file

@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 206, 329
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Rufus 1.4.8.469"
CAPTION "Rufus 1.4.8.470"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "Start",IDC_START,94,291,50,14
@ -165,7 +165,7 @@ END
RTL_IDD_DIALOG DIALOGEX 12, 12, 206, 329
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
CAPTION "Rufus 1.4.8.469"
CAPTION "Rufus 1.4.8.470"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "Start",IDC_START,94,291,50,14
@ -427,8 +427,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,4,8,469
PRODUCTVERSION 1,4,8,469
FILEVERSION 1,4,8,470
PRODUCTVERSION 1,4,8,470
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -445,13 +445,13 @@ BEGIN
BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "1.4.8.469"
VALUE "FileVersion", "1.4.8.470"
VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2014 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "1.4.8.469"
VALUE "ProductVersion", "1.4.8.470"
END
END
BLOCK "VarFileInfo"

5
src/stdio.c
View file

@ -197,8 +197,7 @@ char* SizeToHumanReadable(uint64_t size, BOOL log, BOOL fake_units)
const char* _StrError(DWORD error_code)
{
if ( (!IS_ERROR(error_code)) || (SCODE_CODE(error_code) == ERROR_SUCCESS)) {
// TODO: this message is wrong!
return lmprintf(MSG_044);
return lmprintf(MSG_050);
}
if (SCODE_FACILITY(error_code) != FACILITY_STORAGE) {
uprintf("StrError: non storage - %08X (%X)\n", error_code, SCODE_FACILITY(error_code));
@ -262,6 +261,8 @@ const char* _StrError(DWORD error_code)
return lmprintf(MSG_077);
case ERROR_CANT_MOUNT_VOLUME:
return lmprintf(MSG_078);
case ERROR_NOT_READY:
return lmprintf(MSG_079);
default:
uprintf("Unknown error: %08X\n", error_code);
SetLastError(error_code);

4
src/stdlg.c
View file

@ -1256,12 +1256,12 @@ INT_PTR CALLBACK NewVersionCallback(HWND hDlg, UINT message, WPARAM wParam, LPAR
return (INT_PTR)TRUE;
}
break;
case UM_ISO_INIT:
case UM_PROGRESS_INIT:
FormatStatus = 0;
download_status = 1;
SetWindowTextU(GetDlgItem(hDlg, IDC_DOWNLOAD), lmprintf(MSG_038));
return (INT_PTR)TRUE;
case UM_ISO_EXIT:
case UM_PROGRESS_EXIT:
if (wParam) {
SetWindowTextU(GetDlgItem(hDlg, IDC_DOWNLOAD), lmprintf(MSG_039));
download_status = 2;