From 9df63b3b2ab26ed2b3343b9762fcd5e965a8a554 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Mon, 19 May 2014 23:25:00 +0100 Subject: [PATCH] [loc] update translation base to v1.0.12 * Also change UM_ISO_ constants to the more generic UM_PROGRESS_ --- res/localization/ChangeLog.txt | 15 +++++++-------- res/localization/rufus.loc | 18 ++++++++++++++---- src/format.c | 5 ++--- src/iso.c | 4 ++-- src/localization_data.h | 2 ++ src/net.c | 4 ++-- src/resource.h | 4 +++- src/rufus.c | 18 +++++++++--------- src/rufus.h | 7 +++---- src/rufus.rc | 12 ++++++------ src/stdio.c | 5 +++-- src/stdlg.c | 4 ++-- 12 files changed, 55 insertions(+), 43 deletions(-) diff --git a/res/localization/ChangeLog.txt b/res/localization/ChangeLog.txt index c6fde322..68faddd0 100644 --- a/res/localization/ChangeLog.txt +++ b/res/localization/ChangeLog.txt @@ -15,6 +15,13 @@ 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. For instance, MSG_114, that was introduced in v1.0.8 is MORE than one line! +o Version 1.0.12 (2014.05.19) + - *NEW* MSG_079 "The device is not ready." + - *NEW* MSG_189 "This ISO image is not compatible with the selected filesystem" + - *NEW* MSG_262 "ISO Support" (If you want to know what it's about, see comment in English translation) + - *NEW* MSG_263 "Use PROPER size units" (If you want to know what it's about, see comment from English translation) + - Changed MSG_165 "Click to select an ISO..." -> "Click to select an image..." + o Version 1.0.11 (2014.03.29) - Changed MSG_011 "%u bad block(s) found" -> "%d bad block(s) found" Note: since this doesn't require translator involvement, I have applied the change to existing translations. @@ -76,11 +83,3 @@ o Version 1.0.1 (2013.10.28) o Version 1.0.0 (2013.10.20) - Initial version - -[TODO] (NOTE: THIS PART IS ONLY INTENDED FOR THE RUFUS DEVELOPER, NOT THE TRANSLATORS) - - MSG_165 should be altered to say image - - NEW message for wrong MSG_044 in _StrError() - - NEW message for Alt-I toggle - - NEW message for Alt-U toggle - - NEW message for ERROR_NOT_READY - - NEW message for "This ISO is not compatible with the selected filesystem" (rufus.c ~1407) \ No newline at end of file diff --git a/res/localization/rufus.loc b/res/localization/rufus.loc index cbb3b562..1e41a234 100644 --- a/res/localization/rufus.loc +++ b/res/localization/rufus.loc @@ -53,7 +53,7 @@ # 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 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.11 +v 1.0.12 # Main dialog g IDD_DIALOG @@ -225,6 +225,7 @@ t MSG_075 "Unable to remount volume." t MSG_076 "Unable to patch/setup files for boot." t MSG_077 "Unable to assign a drive letter." t MSG_078 "Can't mount GUID volume." +t MSG_079 "The device is not ready." t MSG_080 "Rufus detected that Windows is still flushing its internal buffers onto the USB device.\n\n" "Depending on the speed of your USB device, this operation may take a long time to complete, " @@ -321,7 +322,7 @@ t MSG_161 "Check the device for bad blocks using a test pattern" t MSG_162 "Uncheck this box to use the \"slow\" format method" t MSG_163 "Check this box to make the USB drive bootable" t MSG_164 "Method that will be used to make the drive bootable" -t MSG_165 "Click to select an ISO..." +t MSG_165 "Click to select an image..." t MSG_166 "Check this box to allow the display of international labels " "and set a device icon (creates an autorun.inf)" t MSG_167 "Install an MBR that allows boot selection and can masquerade the BIOS USB drive ID" @@ -352,6 +353,7 @@ t MSG_186 "Rufus does not install or run background services, therefore update c "Internet access is of course required when checking for updates." t MSG_187 "Invalid image for selected boot option" t MSG_188 "The current image doesn't match the boot option selected. Please use a different image or choose a different boot option." +t MSG_189 "This ISO image is not compatible with the selected filesystem" # Status messages - these messages will appear on the status bar t MSG_201 "Cancelling - Please wait..." @@ -432,6 +434,10 @@ t MSG_258 "Rock Ridge support" t MSG_259 "Force update" t MSG_260 "NTFS compression" t MSG_261 "Writing image: %0.1f%% completed" +# Cheat mode message to disable ISO Support so that only DD images can be opened +t MSG_262 "ISO Support" +# Cheat mode to force legacy size units, where 1 KB is 1024 bytes and NOT that fake 1000 bytes abomination! +t MSG_263 "Use PROPER size units" ################################################################################ ############################# TRANSLATOR END COPY ############################## ################################################################################ @@ -3165,7 +3171,7 @@ t MSG_261 "Kirjoitetaan levykuvaa: %0.1f%% valmiina" ################################################################################ l "fr-FR" "French (Français)" 0x040c, 0x080c, 0x0c0c, 0x100c, 0x140c, 0x180c, 0x1c0c, 0x200c, 0x240c, 0x280c, 0x2c0c, 0x300c, 0x340c, 0x380c, 0xe40c -v 1.0.11 +v 1.0.12 b "en-US" g IDD_DIALOG @@ -3334,6 +3340,7 @@ t MSG_075 "Echec lors du remontage du volume." t MSG_076 "Echec de modification des fichiers de démarrage." t MSG_077 "Echec d'assignation d'une lettre de volume." t MSG_078 "Impossible de monter le volume GUID." +t MSG_079 "Le périphérique n'est pas prêt." t MSG_080 "Rufus a détecté que Windows est en train de finir de vider la mémoire tampon.\n\n" "En fonction de la vitesse de votre périphérique et de la taille du fichier, cette opération peut " @@ -3425,7 +3432,7 @@ t MSG_161 "Détecte la présence de blocs défectueux en écrivant d'un motif de t MSG_162 "Décochez cette case si vous voulez utiliser la méthode de formatage \"lente\" " t MSG_163 "Cochez cette case pour rendre le périphérique démarrable" t MSG_164 "Méthode à utiliser pour rendre le périphérique démarrable " -t MSG_165 "Cliquez ici pour sélectionner une image ISO..." +t MSG_165 "Cliquez ici pour sélectionner une image..." t MSG_166 "Cochez cette case pour permettre l’affichage des caractères étendus/internationaux " "et ajouter une icône (ceci créera un fichier autorun.inf)" t MSG_167 "Installe un MBR permettant la sélection du périphérique de démarrage. Peut aussi " @@ -3458,6 +3465,7 @@ t MSG_186 "Aucun service ou tâche de fond n'est installé ou lancé par Rufus ; "Bien entendu, un accès à internet est requis pour vérifier les mises à jour." t MSG_187 "Image invalide pour l'option de démarrage sélectionnée" t MSG_188 "L'image choisie ne correspond pas à l'option de démarrage sélectionnée. Veuillez utiliser une image ou une option de démarrage différente." +t MSG_189 "Cette image ISO n'est pas compatible avec le système de fichiers sélectionné" # Status messages t MSG_201 "Annulation - Veuillez patienter..." @@ -3521,6 +3529,8 @@ t MSG_258 "Support Rock Ridge" t MSG_259 "Forçage de mise à jour" t MSG_260 "Compression NTFS" t MSG_261 "Ecriture d'image : %0.1f%% complété" +t MSG_262 "Support ISO" +t MSG_263 "Affich. tailles avec de VRAIES unités" ################################################################################ l "de-DE" "German (Deutsch)" 0x0407, 0x0807, 0x0c07, 0x1007, 0x1407 diff --git a/src/format.c b/src/format.c index 9acc035b..f4201e7d 100644 --- a/src/format.c +++ b/src/format.c @@ -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 diff --git a/src/iso.c b/src/iso.c index 94faf404..cac6d85f 100644 --- a/src/iso.c +++ b/src/iso.c @@ -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) diff --git a/src/localization_data.h b/src/localization_data.h index 8d4a30f8..9593ee37 100644 --- a/src/localization_data.h +++ b/src/localization_data.h @@ -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), diff --git a/src/net.c b/src/net.c index dc78bbcf..d47eca25 100644 --- a/src/net.c +++ b/src/net.c @@ -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); diff --git a/src/resource.h b/src/resource.h index f036d9d8..68f681e3 100644 --- a/src/resource.h +++ b/src/resource.h @@ -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 // diff --git a/src/rufus.c b/src/rufus.c index e7d624f2..e09e9e7b 100644 --- a/src/rufus.c +++ b/src/rufus.c @@ -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; } diff --git a/src/rufus.h b/src/rufus.h index f245ee4d..2201b4e8 100644 --- a/src/rufus.h +++ b/src/rufus.h @@ -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 }; diff --git a/src/rufus.rc b/src/rufus.rc index a107f8e2..1f7e0333 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -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" diff --git a/src/stdio.c b/src/stdio.c index 7dcbed9d..295c0bea 100644 --- a/src/stdio.c +++ b/src/stdio.c @@ -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); diff --git a/src/stdlg.c b/src/stdlg.c index 37dc9134..10680c87 100644 --- a/src/stdlg.c +++ b/src/stdlg.c @@ -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;