From 4d89e83b5d676f5682d5c7e82072485d6834fe23 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Sat, 27 May 2023 16:18:22 +0100
Subject: [PATCH] [ui] change the log icon to something more explicit

* Hopefully a notepad/logbook icon will be more intuitive.
* Also tweak the new message for diskcopy.dll download and add French translation.
---
 res/icons/log-16.png | Bin 115 -> 351 bytes
 res/icons/log-24.png | Bin 218 -> 517 bytes
 res/icons/log-32.png | Bin 125 -> 365 bytes
 res/icons/log.svg    |   7 +++++++
 res/loc/po/fr-FR.po  |  20 +++++++++++++++++---
 res/loc/rufus.loc    |   4 ++--
 src/rufus.c          |   2 +-
 src/rufus.rc         |  10 +++++-----
 8 files changed, 32 insertions(+), 11 deletions(-)
 create mode 100644 res/icons/log.svg

diff --git a/res/icons/log-16.png b/res/icons/log-16.png
index 2521c17d1ff17afb038484b122288dcbcf064e70..3d601aeb2c3e41eaf8e1b628889c3da9e92a9906 100644
GIT binary patch
delta 335
zcmV-V0kHma-vW>re+UKu001BJ|6u?C00eVFNmK|32nc)#WQYI&0TxL_K~y-6?UO-E
z!f+VIfBs$0Db`F4vnhoj45Gk8$2xlI(ycGj7xAm?(y?17Vd1496frgkmt=0W>`w=2
zT{gjE&<pS3Jv`6*d*FRj0ENRdY8O|MHOsZSLQ%GM&<qoRe{eDuZ}+!^p0iSzt+mkG
z9SI<`x=HcmTmocDh73K2`C|_m2C?lAZ2X}enJHiMDId=xp;j6)oQ%a{=AqTi#7M5y
z6*3Hd4bpiXwbF<Pl)|?7d~xuHcOuSUG4l|rwwfTF*U9Z4#S*;sZ~h7X27y1YajkAF
zK``p0R-4f*N#36xnD(v(EPp}SER)@9C7!ZcZAQNXpe*y+=<N=fk|E2dmvM^|D+RDo
h+$DE#yq54M&NmVD?As0CDGdMs002ovPDHLkV1nh6mt6n=

delta 97
zcmcc5R6Ic<nvt1-fkD+aR|!b51^9%xYSeEBGPmxxUkRj`N`m}?|1tbo!^jQfNqM?B
whE&{2{_%f4Bgd=%jvfMB1&92Y4*vho&|NC9;n`^|9-t})Pgg&ebxsLQ09qU$Qvd(}

diff --git a/res/icons/log-24.png b/res/icons/log-24.png
index ff0fc8c69a3eddfb68d9df95fd97912d61899abf..3f394be2786b83253a5d509eec2bd7c1197c3fa9 100644
GIT binary patch
delta 503
zcmV<T0SNxu0fhvR7=H)`0002scRlz3000DYLP=Bz2nYy#2xN!=00F#7L_t(YiS3oa
zPSj8ohQD)}Adm={PC{4_gDVY@4X&yQ$X0gDZsbj-9UcHSz6xQ(BvV+hk%UP^#o$7s
zF>G)gW<rDZUKi6&TN!DJ#JJ#Jot%4n{&T*jJwmAB!U~pM(tq5X+@rPfYT@^+F{TdG
zMFe9E0R7@C&czs0iRu*)MRC5&$ka@ftDn8ySv~*shO_s(x!bnvWya@TBn*_ovP%x&
zgdMn}kDj^O@2KYM4G;xNWmnc3j7DGhh={}nF%}~tZiFbhP@FGg*(E0nQFCvzdb06~
zu%3wxw5HXld4EHb)83tl`)&`>=Xc5e93Xl~!dMbHfNH<N3Mj?c>|$R;tws(1>k;4g
zw=x+e8_I=fXz~GLvx}LCOz@-HYSeBK-6HxIh(yF|9c*7hBqBXTVJwMU3Q>9jr5Jtu
z+yN?~d*$xKrxopY2Cj=JJwaD>x-ZNHyuU@1)PI2J%Wwypdz;yajt{PfsC~Fg`!N6F
zi4B6Ed|ZF&S@yDb@5xdRk<kIgg_Ya|N2X>je+NPP6n)_XF`{s{8tCoWRGf95GDyhH
t-SVI1LHB<GfEpY|28VC3J_Ma_`~ut#xWeNdUOE5(002ovPDHLkV1f-#>`DLt

delta 202
zcmZo=xy3j^qMn7Bfq_9NQsFd^k_+$&aRt&E_1o3!wjq;1E=0s-(Y0`(3a*kMzhH*?
z`hS1x_SM<{JyjZY87P|Q>EaktaVyz@(W%Qzf#r}FkJ>psAg#x<jKlR1PZ~$6X2q15
z$`)EHWP+bDBqt{ar#UAlGcPc@*7o7jCysBIJ~1RsU3l|w48xYYbB^9jZQ_bN#WQir
l!e8tw*jgNR$fz!1xZtHd_pbhixj@?(JYD@<);T3K0RWtGO<Mo}

diff --git a/res/icons/log-32.png b/res/icons/log-32.png
index e752895975a19c7063dba9a812baccf500ab8f94..00a9a3064d1830d7140ab3ecbbebac3aa03e7943 100644
GIT binary patch
delta 349
zcmV-j0iynW?E;V(e+UKu0047(dh`GQ00eVFNmK|32nc)#WQYI&0VGL8K~z|U?Uzk%
z!Y~j<KL%H_L^jY}viB8OaSx8c3AhNHr03`^tF}^DP-Rj6jFp&fa4;&VF(jy!{C3Gi
zn#?yZQrv+>GM*w5LyZR@vy|TE6VM}?{RXQmXeCK~el*(be`ye-%X?=DGXQuVjlmNE
z9*e4Q&?Sm>4wWyke3>=!0>>4f-D3d26Y*pBUEb4?7(!-gt81!V!6i&mKDZKO<{_D-
zWbep0u(v$8l#~lsf&>71w?eVbaVS((Fb<U4FQ0zicsXE_@@cSld`Vson52AgB^VqC
z4g?2+1HpmdS3q#!e>u?9-?0q=r^!mWsixCPlFU+aO>i$A`@%k&m2yM7_t!?7@mPRG
veGQzBX0<CY4z$hRIvd_%`K`3=*42Cit0;D<{@9Xo00000NkvXXu0mjfC$yIy

delta 107
zcmaFMR69W;m64f&fx&aji|s&)Ex;$l6-aB;Z_k_kwh_o;DhcunX85NwO-LEYQ}J|h
z45_%4?9lMvfkBbaz`&rH)5Ngk(V73B=O1KgO`5UoAS1)XC3e3#b{{(nRL|h)>gTe~
HDWM4f{DCA_

diff --git a/res/icons/log.svg b/res/icons/log.svg
new file mode 100644
index 00000000..91bf4a83
--- /dev/null
+++ b/res/icons/log.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+  <g id="icon">
+    <path d="M30,30H4v-4H2v-2h2v-2H2v-2h2v-2H2v-2h2v-2H2v-2h2v-2H2V8h2V6H2V4h2V0h26V30zM6,28h22V2H6v2h2v2H6v2h2v2H6v2h2v2H6v2h2v2H6v2h2v2H6v2h2v2H6V28zM24,24H12v-2h12V24zM24,20H12v-2h12V20zM24,16H12v-2h12V16zM24,12H12v-2h12V12zM24,8H12V6h12V8z" fill="#287FB7"/>
+  </g>
+</svg>
diff --git a/res/loc/po/fr-FR.po b/res/loc/po/fr-FR.po
index 464d5a02..c06bd232 100644
--- a/res/loc/po/fr-FR.po
+++ b/res/loc/po/fr-FR.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 3.22\n"
 "Report-Msgid-Bugs-To: pete@akeo.ie\n"
-"POT-Creation-Date: 2023-02-08 17:07+0000\n"
-"PO-Revision-Date: 2023-02-15 21:54+0000\n"
+"POT-Creation-Date: 2023-05-26 12:25+0100\n"
+"PO-Revision-Date: 2023-05-26 12:25+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -13,7 +13,7 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Rufus-LanguageName: French (Français)\n"
 "X-Rufus-LCID: 0x040c, 0x080c, 0x0c0c, 0x100c, 0x140c, 0x180c, 0x1c0c, 0x200c, 0x240c, 0x280c, 0x2c0c, 0x300c, 0x340c, 0x380c, 0xe40c\n"
-"X-Generator: Poedit 3.2.2\n"
+"X-Generator: Poedit 3.3.1\n"
 
 #. • IDD_DIALOG → IDS_DRIVE_PROPERTIES_TXT
 msgid "Drive Properties"
@@ -1848,6 +1848,20 @@ msgstr "Désactiver l'encryption automatique BitLocker"
 msgid "Persistent log"
 msgstr "Log persistent"
 
+#. • MSG_337
+msgid ""
+"An additional file ('diskcopy.dll') must be downloaded from Microsoft to install MS-DOS:\n"
+"- Select 'Yes' to connect to the Internet and download it\n"
+"- Select 'No' to cancel the operation\n"
+"\n"
+"Note: The file will be downloaded in the application's directory and will be reused automatically if present."
+msgstr ""
+"Un fichier supplémentaire ('diskcopy.dll') doit être téléchargé depuis Microsoft pour installer MS-DOS :\n"
+"- Sélectionnez 'Oui' pour vous connecter à Internet et le télécharger\n"
+"- Sélectionnez 'Non' pour annuler l’opération\n"
+"\n"
+"Note : Ce fichier sera téléchargé dans le répertoire de l'application et réutilisé automatiquement s'il est présent."
+
 #. • MSG_900
 #.
 #. The following messages are for the Windows Store listing only and are not used by the application
diff --git a/res/loc/rufus.loc b/res/loc/rufus.loc
index cca0f0b4..3ef39c9c 100644
--- a/res/loc/rufus.loc
+++ b/res/loc/rufus.loc
@@ -596,8 +596,7 @@ t MSG_336 "Persistent log"
 t MSG_337 "An additional file ('diskcopy.dll') must be downloaded from Microsoft to install MS-DOS:\n"
 	"- Select 'Yes' to connect to the Internet and download it\n"
 	"- Select 'No' to cancel the operation\n\n"
-	"Note: The file will be downloaded in the current application directory and will be reused "
-	"automatically if present."
+	"Note: The file will be downloaded in the application's directory and will be reused automatically if present."
 # The following messages are for the Windows Store listing only and are not used by the application
 t MSG_900 "Rufus is a utility that helps format and create bootable USB flash drives, such as USB keys/pendrives, memory sticks, etc."
 t MSG_901 "Official site: %s"
@@ -4686,6 +4685,7 @@ t MSG_333 "Créer un compte local sous le nom de :"
 t MSG_334 "Définir les options régionales avec les mêmes valeurs que celles de cet utilisateur"
 t MSG_335 "Désactiver l'encryption automatique BitLocker"
 t MSG_336 "Log persistent"
+t MSG_337 "Un fichier supplémentaire ('diskcopy.dll') doit être téléchargé depuis Microsoft pour installer MS-DOS :\n- Sélectionnez 'Oui' pour vous connecter à Internet et le télécharger\n- Sélectionnez 'Non' pour annuler l’opération\n\nNote : Ce fichier sera téléchargé dans le répertoire de l'application et réutilisé automatiquement s'il est présent."
 t MSG_900 "Rufus est un utilitaire permettant de formater et de créer des média USB amorçables, tels que clés USB, mémoire flash, etc."
 t MSG_901 "Site officiel : %s"
 t MSG_902 "Code source: %s"
diff --git a/src/rufus.c b/src/rufus.c
index b27cef68..3ed3c452 100755
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -1831,7 +1831,7 @@ static DWORD WINAPI BootCheckThread(LPVOID param)
 			uprintf("Will reuse '%s' for MS-DOS installation", tmp);
 		} else {
 			r = MessageBoxExU(hMainDialog, lmprintf(MSG_337), lmprintf(MSG_115),
-				MB_YESNOCANCEL | MB_ICONWARNING | MB_IS_RTL, selected_langid);
+				MB_YESNO | MB_ICONWARNING | MB_IS_RTL, selected_langid);
 			if (r != IDYES)
 				goto out;
 			IGNORE_RETVAL(_chdirU(app_data_dir));
diff --git a/src/rufus.rc b/src/rufus.rc
index 719ef5ea..a9a6df74 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 4.1.2041"
+CAPTION "Rufus 4.1.2042"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -392,8 +392,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,1,2041,0
- PRODUCTVERSION 4,1,2041,0
+ FILEVERSION 4,1,2042,0
+ PRODUCTVERSION 4,1,2042,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -411,13 +411,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "4.1.2041"
+            VALUE "FileVersion", "4.1.2042"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2023 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-4.1.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "4.1.2041"
+            VALUE "ProductVersion", "4.1.2042"
         END
     END
     BLOCK "VarFileInfo"