Merge.rc:

- Rename "Quick compare limit (MB)" to "Threshold for switching to quick compare (MB)" - Rename "Binary compare limit (MB)" to "Threshold for switching to binary compare (MB)" related to #318, #1092 and #1100
WinMerge · Dec 23, 2021 · e9bfd60 · e9bfd60
1 parent 207457b
commit e9bfd60
Show file tree

Hide file tree

Showing 42 changed files with 287 additions and 306 deletions.
diff --git a/Docs/Manual/EN/Configuration.xml b/Docs/Manual/EN/Configuration.xml
@@ -972,7 +972,7 @@
     </section>
 
     <section>
-      <title>Quick compare limit (MB)<indexterm>
+      <title>Threshold for switching to quick compare (MB)<indexterm>
           <primary>Quick compare</primary>
 
           <secondary>limit</secondary>
@@ -997,7 +997,7 @@
     </section>
 
     <section>
-      <title>Binary compare limit (MB)<indexterm>
+      <title>Threshold for switching to binary compare (MB)<indexterm>
           <primary>Binary compare</primary>
 
           <secondary>limit</secondary>

diff --git a/Src/Merge.rc b/Src/Merge.rc
@@ -2105,9 +2105,9 @@ BEGIN
     CONTROL         "&Automatically expand all subfolders",IDC_EXPAND_SUBDIRS,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,84,239,10
     CONTROL         "Ignore &Reparse Points",IDC_IGNORE_REPARSEPOINTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,96,239,10
-    LTEXT           "&Quick compare limit (MB):",IDC_STATIC,6,108,239,10
+    LTEXT           "Threshold for switching to &quick compare (MB):",IDC_STATIC,6,108,239,10
     EDITTEXT        IDC_COMPARE_QUICKC_LIMIT,6,120,30,14,ES_AUTOHSCROLL
-    LTEXT           "&Binary compare limit (MB):",IDC_STATIC,6,138,239,10
+    LTEXT           "Threshold for switching to &binary compare (MB):",IDC_STATIC,6,138,239,10
     EDITTEXT        IDC_COMPARE_BINARYC_LIMIT,6,150,30,14,ES_AUTOHSCROLL
     LTEXT           "\n&Number of compare threads (a negative value implies addition of the number of available CPU cores):",IDC_STATIC,6,166,239,30
     EDITTEXT        IDC_COMPARE_THREAD_COUNT,6,198,30,14,ES_AUTOHSCROLL

diff --git a/Translations/TranslationsStatus.html b/Translations/TranslationsStatus.html
@@ -37,7 +37,7 @@
 </head>
 <body>
 <h1>Translations Status</h1>
-<p>Status from <strong>2021-12-22</strong>:</p>
+<p>Status from <strong>2021-12-23</strong>:</p>
 <h2>WinMerge</h2>
 <table class="status">
   <tr>
@@ -52,36 +52,36 @@ <h2>WinMerge</h2>
   <tr>
     <td class="left">Arabic</td>
     <td class="right">1155</td>
-    <td class="right translated">904</td>
+    <td class="right translated">902</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">251</td>
+    <td class="right untranslated">253</td>
     <td class="right">78 %</td>
     <td class="center">2019-12-30</td>
   </tr>
   <tr>
     <td class="left">Basque</td>
     <td class="right">1155</td>
-    <td class="right translated">641</td>
+    <td class="right translated">640</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">514</td>
+    <td class="right untranslated">515</td>
     <td class="right">55 %</td>
     <td class="center">2013-02-03</td>
   </tr>
   <tr>
     <td class="left">Brazilian</td>
     <td class="right">1155</td>
-    <td class="right translated">1088</td>
+    <td class="right translated">1086</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">67</td>
+    <td class="right untranslated">69</td>
     <td class="right">94 %</td>
     <td class="center">2021-08-09</td>
   </tr>
   <tr>
     <td class="left">Bulgarian</td>
     <td class="right">1155</td>
-    <td class="right translated">969</td>
+    <td class="right translated">967</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">186</td>
+    <td class="right untranslated">188</td>
     <td class="right">84 %</td>
     <td class="center">2021-06-28</td>
   </tr>
@@ -97,28 +97,28 @@ <h2>WinMerge</h2>
   <tr>
     <td class="left">ChineseSimplified</td>
     <td class="right">1155</td>
-    <td class="right translated">977</td>
+    <td class="right translated">975</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">178</td>
-    <td class="right">85 %</td>
+    <td class="right untranslated">180</td>
+    <td class="right">84 %</td>
     <td class="center"></td>
   </tr>
   <tr>
     <td class="left">ChineseTraditional</td>
     <td class="right">1155</td>
-    <td class="right translated">1093</td>
+    <td class="right translated">1091</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">62</td>
-    <td class="right">95 %</td>
+    <td class="right untranslated">64</td>
+    <td class="right">94 %</td>
     <td class="center">2021-12-11</td>
   </tr>
   <tr>
     <td class="left">Corsican</td>
     <td class="right">1155</td>
-    <td class="right translated">1138</td>
+    <td class="right translated">1136</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">17</td>
-    <td class="right">99 %</td>
+    <td class="right untranslated">19</td>
+    <td class="right">98 %</td>
     <td class="center"></td>
   </tr>
   <tr>
@@ -133,27 +133,27 @@ <h2>WinMerge</h2>
   <tr>
     <td class="left">Czech</td>
     <td class="right">1155</td>
-    <td class="right translated">607</td>
+    <td class="right translated">606</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">548</td>
-    <td class="right">53 %</td>
+    <td class="right untranslated">549</td>
+    <td class="right">52 %</td>
     <td class="center"></td>
   </tr>
   <tr>
     <td class="left">Danish</td>
     <td class="right">1155</td>
-    <td class="right translated">641</td>
+    <td class="right translated">640</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">514</td>
+    <td class="right untranslated">515</td>
     <td class="right">55 %</td>
     <td class="center">2013-01-13</td>
   </tr>
   <tr>
     <td class="left">Dutch</td>
     <td class="right">1155</td>
-    <td class="right translated">1101</td>
+    <td class="right translated">1099</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">54</td>
+    <td class="right untranslated">56</td>
     <td class="right">95 %</td>
     <td class="center">2018-09-06</td>
   </tr>
@@ -164,42 +164,42 @@ <h2>WinMerge</h2>
     <td class="right fuzzy">0</td>
     <td class="right untranslated">0</td>
     <td class="right">100 %</td>
-    <td class="center">2021-12-22</td>
+    <td class="center">2021-12-23</td>
   </tr>
   <tr>
     <td class="left">Finnish</td>
     <td class="right">1155</td>
-    <td class="right translated">904</td>
+    <td class="right translated">902</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">251</td>
+    <td class="right untranslated">253</td>
     <td class="right">78 %</td>
     <td class="center"></td>
   </tr>
   <tr>
     <td class="left">French</td>
     <td class="right">1155</td>
-    <td class="right translated">1021</td>
+    <td class="right translated">1019</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">134</td>
+    <td class="right untranslated">136</td>
     <td class="right">88 %</td>
     <td class="center">2021-04-29</td>
   </tr>
   <tr>
     <td class="left">Galician</td>
     <td class="right">1155</td>
-    <td class="right translated">1138</td>
+    <td class="right translated">1136</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">17</td>
-    <td class="right">99 %</td>
+    <td class="right untranslated">19</td>
+    <td class="right">98 %</td>
     <td class="center">2021-12-18</td>
   </tr>
   <tr>
     <td class="left">German</td>
     <td class="right">1155</td>
-    <td class="right translated">1138</td>
+    <td class="right translated">1136</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">17</td>
-    <td class="right">99 %</td>
+    <td class="right untranslated">19</td>
+    <td class="right">98 %</td>
     <td class="center">2021-12-16</td>
   </tr>
   <tr>
@@ -214,46 +214,46 @@ <h2>WinMerge</h2>
   <tr>
     <td class="left">Hungarian</td>
     <td class="right">1155</td>
-    <td class="right translated">1136</td>
+    <td class="right translated">1134</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">19</td>
+    <td class="right untranslated">21</td>
     <td class="right">98 %</td>
     <td class="center">2021-03-15</td>
   </tr>
   <tr>
     <td class="left">Italian</td>
     <td class="right">1155</td>
-    <td class="right translated">994</td>
+    <td class="right translated">992</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">161</td>
+    <td class="right untranslated">163</td>
     <td class="right">86 %</td>
     <td class="center">2021-08-09</td>
   </tr>
   <tr>
     <td class="left">Japanese</td>
     <td class="right">1155</td>
-    <td class="right translated">1152</td>
+    <td class="right translated">1153</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">3</td>
+    <td class="right untranslated">2</td>
     <td class="right">100 %</td>
     <td class="center">2021-11-21</td>
   </tr>
   <tr>
     <td class="left">Korean</td>
     <td class="right">1155</td>
-    <td class="right translated">1037</td>
+    <td class="right translated">1035</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">118</td>
+    <td class="right untranslated">120</td>
     <td class="right">90 %</td>
     <td class="center">2021-12-10</td>
   </tr>
   <tr>
     <td class="left">Lithuanian</td>
     <td class="right">1155</td>
-    <td class="right translated">1116</td>
+    <td class="right translated">1114</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">39</td>
-    <td class="right">97 %</td>
+    <td class="right untranslated">41</td>
+    <td class="right">96 %</td>
     <td class="center">2021-12-15</td>
   </tr>
   <tr>
@@ -268,28 +268,28 @@ <h2>WinMerge</h2>
   <tr>
     <td class="left">Persian</td>
     <td class="right">1155</td>
-    <td class="right translated">644</td>
+    <td class="right translated">643</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">511</td>
+    <td class="right untranslated">512</td>
     <td class="right">56 %</td>
     <td class="center">2013-08-15</td>
   </tr>
   <tr>
     <td class="left">Polish</td>
     <td class="right">1155</td>
-    <td class="right translated">1112</td>
+    <td class="right translated">1110</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">43</td>
+    <td class="right untranslated">45</td>
     <td class="right">96 %</td>
     <td class="center"></td>
   </tr>
   <tr>
     <td class="left">Portuguese</td>
     <td class="right">1155</td>
-    <td class="right translated">1138</td>
+    <td class="right translated">1136</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">17</td>
-    <td class="right">99 %</td>
+    <td class="right untranslated">19</td>
+    <td class="right">98 %</td>
     <td class="center">2021-12-20</td>
   </tr>
   <tr>
@@ -304,9 +304,9 @@ <h2>WinMerge</h2>
   <tr>
     <td class="left">Russian</td>
     <td class="right">1155</td>
-    <td class="right translated">1094</td>
+    <td class="right translated">1092</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">61</td>
+    <td class="right untranslated">63</td>
     <td class="right">95 %</td>
     <td class="center">2021-10-28</td>
   </tr>
@@ -331,46 +331,46 @@ <h2>WinMerge</h2>
   <tr>
     <td class="left">Slovak</td>
     <td class="right">1155</td>
-    <td class="right translated">977</td>
+    <td class="right translated">975</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">178</td>
-    <td class="right">85 %</td>
+    <td class="right untranslated">180</td>
+    <td class="right">84 %</td>
     <td class="center">2020-11-02</td>
   </tr>
   <tr>
     <td class="left">Slovenian</td>
     <td class="right">1155</td>
-    <td class="right translated">1138</td>
+    <td class="right translated">1136</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">17</td>
-    <td class="right">99 %</td>
+    <td class="right untranslated">19</td>
+    <td class="right">98 %</td>
     <td class="center">2021-12-16</td>
   </tr>
   <tr>
     <td class="left">Spanish</td>
     <td class="right">1155</td>
-    <td class="right translated">873</td>
+    <td class="right translated">871</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">282</td>
-    <td class="right">76 %</td>
+    <td class="right untranslated">284</td>
+    <td class="right">75 %</td>
     <td class="center">2020-04-03</td>
   </tr>
   <tr>
     <td class="left">Swedish</td>
     <td class="right">1155</td>
-    <td class="right translated">1096</td>
+    <td class="right translated">1094</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">59</td>
+    <td class="right untranslated">61</td>
     <td class="right">95 %</td>
     <td class="center">2021-09-15</td>
   </tr>
   <tr>
     <td class="left">Turkish</td>
     <td class="right">1155</td>
-    <td class="right translated">1138</td>
+    <td class="right translated">1136</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">17</td>
-    <td class="right">99 %</td>
+    <td class="right untranslated">19</td>
+    <td class="right">98 %</td>
     <td class="center">2021-12-21</td>
   </tr>
   <tr>