From bb00983ad81c3f95e35487c8a175dde2b055b0f4 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Fri, 20 Jul 2018 14:59:38 +0100 Subject: [PATCH] [pollock] small fixes & improvements * Make sure translations that are the same as English are removed in the .po * Automate digital signature * Add a more distinguishable icon * Also update French translation --- .gitignore | 1 + appveyor.yml | 2 ++ res/loc/ChangeLog.txt | 8 +++++--- res/loc/po/fr-FR.po | 26 +++++++++++++------------- res/loc/pollock/Pollock.cs | 21 +++++++++++++-------- res/loc/pollock/Pollock.csproj | 24 ++++++++++++++++++++++-- res/loc/pollock/pollock.ico | Bin 0 -> 24038 bytes src/rufus.rc | 10 +++++----- 8 files changed, 61 insertions(+), 31 deletions(-) create mode 100644 res/loc/pollock/pollock.ico diff --git a/.gitignore b/.gitignore index 812522df..3a7a7568 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ *.lo *.log *.mac +*.mo *.ncb *.o *.obj diff --git a/appveyor.yml b/appveyor.yml index a6d686f7..ed98bcd7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,6 +6,8 @@ os: Visual Studio 2017 skip_commits: # Don't run AppVeyor for commits that only modify resource or non-code files files: + - .gitignore + - .gitattributes - res/* - '**/*.cmd' - '**/*.md' diff --git a/res/loc/ChangeLog.txt b/res/loc/ChangeLog.txt index 51270d72..ee63482a 100644 --- a/res/loc/ChangeLog.txt +++ b/res/loc/ChangeLog.txt @@ -1,10 +1,12 @@ -This file lists any change that has been applied to the en-US translation of +This file lists all the changes that have been applied to the en-US translation of rufus.loc since its original version. -When editing an existing translation, make sure to follow: +To edit a translation, please make sure to follow: https://github.com/pbatard/rufus/wiki/Localization#Editing_a_translation +Or simply download the latest pollock.exe from https://rufus.ie/locale/ and follow +its directions. -o v3.2 (2018.??.??) +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 diff --git a/res/loc/po/fr-FR.po b/res/loc/po/fr-FR.po index 3bc1c8ba..b6a861fc 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-18 16:45+0100\n" -"PO-Revision-Date: 2018-07-18 17:16+0100\n" +"POT-Creation-Date: 2018-07-20 14:57+0100\n" +"PO-Revision-Date: 2018-07-20 14:57+0100\n" "Language: fr_FR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -117,7 +117,7 @@ msgstr "Licence" #. • IDD_ABOUTBOX → IDOK msgid "OK" -msgstr "OK" +msgstr "" #. • IDD_LICENSE → IDD_LICENSE msgid "Rufus License" @@ -125,7 +125,7 @@ msgstr "Licence Rufus" #. • IDD_NOTIFICATION → IDC_MORE_INFO msgid "More information" -msgstr "Plus d'info..." +msgstr "Plus d'information" #. • IDD_NOTIFICATION → IDYES #. • MSG_008 @@ -139,7 +139,7 @@ msgstr "Non" #. • IDD_LOG → IDD_LOG msgid "Log" -msgstr "Log" +msgstr "" #. • IDD_LOG → IDC_LOG_CLEAR msgid "Clear" @@ -339,7 +339,7 @@ msgstr "BIOS (ou UEFI-CSM)" #. • MSG_032 msgid "UEFI (non CSM)" -msgstr "UEFI (non CSM)" +msgstr "" #. • MSG_033 msgid "BIOS or UEFI" @@ -356,7 +356,7 @@ msgstr "%d passe" #. Number of bad block check passes (plural for 2 or more passes). #. See MSG_087 for the message that %s gets replaced with. msgid "%d passes %s" -msgstr "%d passes %s" +msgstr "" #. • MSG_036 msgid "ISO Image" @@ -364,7 +364,7 @@ msgstr "Image ISO" #. • MSG_037 msgid "Application" -msgstr "Application" +msgstr "" #. • MSG_038 msgid "Abort" @@ -808,7 +808,7 @@ msgstr "Installation standard de Windows" #. http://en.wikipedia.org/wiki/Windows_To_Go in your language. #. Otherwise, you may add a parenthesis eg. "Windows To Go ()" msgid "Windows To Go" -msgstr "Windows To Go" +msgstr "" #. • MSG_119 msgid "advanced drive properties" @@ -838,8 +838,8 @@ msgstr "Taille de partition persistente" #. • MSG_124 #. #. This message appears in the persistence 'Size' control when the slider is set to 0. -#. If running out of space, it is okay to use "No partition" or "None" to indicate that a persistent -#. partition will not be created (because the 'Size' edit control is *not* adjusted for width). +#. It is okay to use "No partition" or "None" or "Deactivated" to indicate that a persistent partition will not be +#. created if the width of the control is too small (since the 'Size' edit control is *not* adjusted for width). msgid "No persistence" msgstr "Désactivée" @@ -970,11 +970,11 @@ msgstr "Cliquez pour sélectionner..." #. • MSG_174 msgid "Rufus - The Reliable USB Formatting Utility" -msgstr "Rufus - The Reliable USB Formatting Utility" +msgstr "" #. • MSG_175 msgid "Version %d.%d (Build %d)" -msgstr "Version %d.%d (Build %d)" +msgstr "" #. • MSG_176 msgid "English translation: Pete Batard " diff --git a/res/loc/pollock/Pollock.cs b/res/loc/pollock/Pollock.cs index ecc6c6c4..ef2f0d47 100644 --- a/res/loc/pollock/Pollock.cs +++ b/res/loc/pollock/Pollock.cs @@ -17,6 +17,11 @@ * along with this program. If not, see . */ +/* + * Icon courtesy of Axialis Fluent Pro 2018 - Letters and Symbols. + * CC BY-ND 4.0 - https://www.axialis.com/icons. + */ + using System; using System.Collections.Generic; using System.ComponentModel; @@ -426,13 +431,13 @@ namespace pollock else { writer.WriteLine($"msgid {en_str}"); - writer.WriteLine($"msgstr {msg_str}"); + writer.WriteLine($"msgstr {((msg_str == en_str) ? "\"\"" : msg_str)}"); } } } nb_po_saved++; + Console.WriteLine("DONE"); } - Console.WriteLine("DONE"); return nb_po_saved; } @@ -1124,11 +1129,6 @@ Retry: Console.WriteLine($"{list[index][0]} was selected."); Console.WriteLine(); po_file = $"{list[index][1]}.po"; - if (File.Exists(po_file)) - { - if (!PromptForQuestion($"A '{po_file}' file already exists. Do you want to overwrite it? (If unsure, answer 'y')")) - goto Error; - } Language old_en_US = null; if (list[index][2] == list[0][2]) @@ -1170,7 +1170,12 @@ Retry: old_en_US = old_langs[0]; } - if (CreatePoFiles(ParseLocFile(loc_file, list[index][1]), old_en_US) != 1) + if (File.Exists(po_file)) + { + if (!PromptForQuestion($"A '{po_file}' file already exists. Do you want to overwrite it? (If unsure, say 'y')")) + goto Error; + } + if (CreatePoFiles(ParseLocFile(loc_file, list[index][1]), old_en_US) < 1) { Console.WriteLine("Failed to create PO file"); goto Error; diff --git a/res/loc/pollock/Pollock.csproj b/res/loc/pollock/Pollock.csproj index 3623856e..e75ae924 100644 --- a/res/loc/pollock/Pollock.csproj +++ b/res/loc/pollock/Pollock.csproj @@ -32,7 +32,7 @@ 4 - ../../rufus.ico + pollock.ico @@ -49,7 +49,27 @@ - + + + + + + + + + + + + $(PostBuildEventDependsOn); + PostBuildMacros; + + for /f "tokens=1,2 delims=." %25%25i in ("@(VersionNumber)") do set "major=%25%25i" &set "minor=%25%25j" +set version=%25major%25.%25minor%25 + if $(ConfigurationName) == Release ( + copy $(TargetDir)$(TargetFileName) $(SolutionDir)..\..\..\pollock-%25version%25.exe /y + $(SolutionDir)..\..\..\_sign.cmd $(SolutionDir)..\..\..\pollock-%25version%25.exe +) + \ No newline at end of file diff --git a/res/loc/pollock/pollock.ico b/res/loc/pollock/pollock.ico new file mode 100644 index 0000000000000000000000000000000000000000..13346aed077f9354f4c566bda3d7f9d6f91aa727 GIT binary patch literal 24038 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 f9J?g0Efd2C5;%nf)DMm1O literal 0 HcmV?d00001 diff --git a/src/rufus.rc b/src/rufus.rc index 04a2e720..b8876142 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.1344" +CAPTION "Rufus 3.2.1345" 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,1344,0 - PRODUCTVERSION 3,2,1344,0 + FILEVERSION 3,2,1345,0 + PRODUCTVERSION 3,2,1345,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.1344" + VALUE "FileVersion", "3.2.1345" 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.1344" + VALUE "ProductVersion", "3.2.1345" END END BLOCK "VarFileInfo"