From f18b3fec1ba09302a9db44ba184f94ec42d28cd0 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Fri, 20 Jul 2018 21:06:39 +0100 Subject: [PATCH] [loc] use better terminology for NAND types --- res/loc/ChangeLog.txt | 11 ++++++----- res/loc/po/fr-FR.po | 17 +++++++++-------- res/loc/rufus.loc | 15 ++++++++------- src/rufus.rc | 10 +++++----- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/res/loc/ChangeLog.txt b/res/loc/ChangeLog.txt index ee63482a..4a7d6d37 100644 --- a/res/loc/ChangeLog.txt +++ b/res/loc/ChangeLog.txt @@ -8,10 +8,11 @@ its directions. o v3.2 (2018.07.20) The following appears in Advanced format options → Check device for bad blocks → dropdown menu with - %s being replaced with SLC, MLC or TLC, which is a type of flash memory. In other words, this message - should mean "for a flash memory device of type %s". *Please* try to keep the translation as short as - possible so that it won't result in an overly large dropdown... - - *NEW* MSG_087 "for %s devices" + %s being replaced with SLC, MLC or TLC, which is a type of NAND (or flash memory. In other words, + this message should mean "for a flash memory device of type %s". *Please* try to keep the translation + as short as possible so that it won't result in an overly large dropdown... + See https://www.mydigitaldiscount.com/everything-you-need-to-know-about-slc-mlc-and-tlc-nand-flash.html + - *NEW* MSG_087 "for %s NAND" The following 4 messages can be tested using https://github.com/pbatard/rufus/raw/master/res/loc/test/casper_test.iso - *NEW* MSG_123 "Persistent partition size" - *NEW* MSG_124 "No persistence" @@ -25,7 +26,7 @@ o v3.2 (2018.07.20) - *NEW* MSG_240 "The signature for the downloaded update can not be validated (...)" You can see this status message by pressing -- and then selecting Start. It's the same as MSG_286 but with a process that *may* be faster, hence the name. - - *NEW* MSG_306 + - *NEW* MSG_306 "Fast-zeroing drive: %0.1f%% completed" Note: Because this is the introduction of a new translation framework, and I am a bit short of time for that unification of MSG_084/MSG_104/MSG_114/MSG_116 will happen in another translation round... diff --git a/res/loc/po/fr-FR.po b/res/loc/po/fr-FR.po index b6a861fc..124a98db 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.2\n" "Report-Msgid-Bugs-To: pete@akeo.ie\n" -"POT-Creation-Date: 2018-07-20 14:57+0100\n" -"PO-Revision-Date: 2018-07-20 14:57+0100\n" +"POT-Creation-Date: 2018-07-20 21:03+0100\n" +"PO-Revision-Date: 2018-07-20 21:04+0100\n" "Language: fr_FR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -593,12 +593,13 @@ msgstr "Aucune image sélectionnée" #. • MSG_087 #. #. This message appears in Advanced format options → Check device for bad blocks → dropdown menu -#. %s will be replaced with SLC, MLC or TLC, which is a type of flash memory. In other words, this -#. message should mean "for a flash memory device of type %s". *Please* try to keep the translation -#. as short as possible so that it won't result in an overly large dropdown... It's okay to use a -#. translation for "type" instead of "device" (e.g. "for TLC type"). See also MSG_035. -msgid "for %s devices" -msgstr "pour type %s" +#. %s will be replaced with SLC, MLC or TLC, which is a type of NAND (or flash memory). In other +#. words, this message should mean "for a flash memory device of type %s". *Please* try to keep +#. the translation as short as possible so that it won't result in an overly large dropdown... +#. If you prefer, it's okay to use "type" or "device" instead of "NAND" (e.g. "for TLC type"). +#. See also MSG_035. +msgid "for %s NAND" +msgstr "pour NAND %s" #. • MSG_088 msgid "Image is too big" diff --git a/res/loc/rufus.loc b/res/loc/rufus.loc index 898cf3e4..f30beafd 100644 --- a/res/loc/rufus.loc +++ b/res/loc/rufus.loc @@ -227,11 +227,12 @@ t MSG_084 "This ISO image seems to use an obsolete version of '%s'.\n" t MSG_085 "Downloading '%s'" t MSG_086 "No image selected" # This message appears in Advanced format options → Check device for bad blocks → dropdown menu -# %s will be replaced with SLC, MLC or TLC, which is a type of flash memory. In other words, this -# message should mean "for a flash memory device of type %s". *Please* try to keep the translation -# as short as possible so that it won't result in an overly large dropdown... It's okay to use a -# translation for "type" instead of "device" (e.g. "for TLC type"). See also MSG_035. -t MSG_087 "for %s devices" +# %s will be replaced with SLC, MLC or TLC, which is a type of NAND (or flash memory). In other +# words, this message should mean "for a flash memory device of type %s". *Please* try to keep +# the translation as short as possible so that it won't result in an overly large dropdown... +# If you prefer, it's okay to use "type" or "device" instead of "NAND" (e.g. "for TLC type"). +# See also MSG_035. +t MSG_087 "for %s NAND" t MSG_088 "Image is too big" t MSG_089 "The image is too big for the selected target." t MSG_090 "Unsupported ISO" @@ -4620,7 +4621,7 @@ t IDS_NEW_VERSION_DOWNLOAD_GRP "Télécharger" t IDC_DOWNLOAD "Télécharger" g IDD_NOTIFICATION -t IDC_MORE_INFO "Plus d'info..." +t IDC_MORE_INFO "Plus d'information" t IDYES "Oui" t IDNO "Non" @@ -4715,7 +4716,7 @@ t MSG_083 "Remplacer %s?" t MSG_084 "Cette image ISO utilise une version obsolète du fichier '%s'.\nLes menus de démarrage peuvent de pas fonctionner à cause de cela.\n\nRufus peut télécharger une nouvelle version du fichier pour résoudre ce problème :\n- Choisissez 'Oui' pour télécharger le fichier depuis Internet\n- Choisissez 'Non' pour garder le fichier de l'image ISO\nSi vous ne savez pas quoi faire, sélectionnez 'Oui'.\n\nNote : Le nouveau fichier sera téléchargé dans le répertoire courant. Si un '%s' existe à cet endroit, il sera réutilisé automatiquement." t MSG_085 "Téléchargement de '%s'" t MSG_086 "Aucune image sélectionnée" -t MSG_087 "pour type %s" +t MSG_087 "pour NAND %s" t MSG_088 "Image trop large" t MSG_089 "L'image est trop large pour être copiée sur le périphérique sélectionné." t MSG_090 "Image ISO non supportée" diff --git a/src/rufus.rc b/src/rufus.rc index b8876142..58df11e3 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 3.2.1345" +CAPTION "Rufus 3.2.1346" 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 3,2,1345,0 - PRODUCTVERSION 3,2,1345,0 + FILEVERSION 3,2,1346,0 + PRODUCTVERSION 3,2,1346,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -411,13 +411,13 @@ BEGIN VALUE "Comments", "https://akeo.ie" VALUE "CompanyName", "Akeo Consulting" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "3.2.1345" + VALUE "FileVersion", "3.2.1346" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus-3.2.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "3.2.1345" + VALUE "ProductVersion", "3.2.1346" END END BLOCK "VarFileInfo"