[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
7 years ago · bb00983ad8
8 changed files with 61 additions and 31 deletions
--- a/.gitignore
+++ b/.gitignore
@ -13,6 +13,7 @@
 *.lo
 *.log
 *.mac
+*.mo
 *.ncb
 *.o
 *.obj
--- 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'
--- 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
--- 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 (<hint at what it does>)"
 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 <mailto:pete@akeo.ie>"
--- a/res/loc/pollock/Pollock.cs
+++ b/res/loc/pollock/Pollock.cs
@ -17,6 +17,11 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+/*
+ * 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;
--- a/res/loc/pollock/Pollock.csproj
+++ b/res/loc/pollock/Pollock.csproj
@ -32,7 +32,7 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <PropertyGroup>
-    <ApplicationIcon>../../rufus.ico</ApplicationIcon>
+    <ApplicationIcon>pollock.ico</ApplicationIcon>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
@ -49,7 +49,27 @@
    <Compile Include="Pollock.cs" />
  </ItemGroup>
  <ItemGroup>
-    <Content Include="../../rufus.ico" />
+    <Content Include="pollock.ico" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="PostBuildMacros">
+    <GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
+      <Output TaskParameter="Assemblies" ItemName="Targets" />
+    </GetAssemblyIdentity>
+    <ItemGroup>
+      <VersionNumber Include="@(Targets->'%(Version)')" />
+    </ItemGroup>
+  </Target>
+  <PropertyGroup>
+    <PostBuildEventDependsOn>
+      $(PostBuildEventDependsOn);
+      PostBuildMacros;
+    </PostBuildEventDependsOn>
+    <PostBuildEvent>for /f "tokens=1,2 delims=." %25%25i in ("@(VersionNumber)") do set "major=%25%25i" &amp;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
+)</PostBuildEvent>
+  </PropertyGroup>
 </Project>
--- a/res/loc/pollock/pollock.ico
+++ b/res/loc/pollock/pollock.ico
--- 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"