Merge.rc: Rename the checkbox "Filter Comments" to "Ignore comment differences"

diff --git a/Docs/Manual/EN/Configuration.xml b/Docs/Manual/EN/Configuration.xml
index 4cb79a6..3fb812e 100644 (file)
--- a/Docs/Manual/EN/Configuration.xml
+++ b/Docs/Manual/EN/Configuration.xml
@@ -581,6 +581,29 @@
     </section>
 
     <section>
+      <title>Ignore comment differences<indexterm>
+          <primary>filters</primary>
+
+          <secondary>comments</secondary>
+        </indexterm></title>
+
+      <!--Just guessing what this does - ask a developer.-->
+
+      <itemizedlist>
+        <listitem>
+          <para><option>Disabled</option> (default): WinMerge compares comments
+          in code, along with other content.</para>
+        </listitem>
+
+        <listitem>
+          <para><option>Enabled</option>: This option optimizes comparisons by
+          detecting comments in certain programming language file types (such as
+          C++ and Java), and ignoring them.</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+
+    <section>
       <title>Enable moved block detection<indexterm>
           <primary>moved differences</primary>
         </indexterm></title>
@@ -674,29 +697,6 @@
         </listitem>
       </itemizedlist>
     </section>
-
-    <section>
-      <title>Filter Comments<indexterm>
-          <primary>filters</primary>
-
-          <secondary>comments</secondary>
-        </indexterm></title>
-
-      <!--Just guessing what this does - ask a developer.-->
-
-      <itemizedlist>
-        <listitem>
-          <para><option>Disabled</option> (default): WinMerge compares comments
-          in code, along with other content.</para>
-        </listitem>
-
-        <listitem>
-          <para><option>Enabled</option>: This option optimizes comparisons by
-          detecting comments in certain programming language file types (such as
-          C++ and Java), and ignoring them.</para>
-        </listitem>
-      </itemizedlist>
-    </section>
   </section>
        
   <section id="Configuration_compare_folder">

diff --git a/Docs/Manual/JP/Configuration.xml b/Docs/Manual/JP/Configuration.xml
index fc3e9df..c80af90 100644 (file)
--- a/Docs/Manual/JP/Configuration.xml
+++ b/Docs/Manual/JP/Configuration.xml
@@ -580,6 +580,29 @@
     </section>
 
     <section>
+      <title>コメントの違いを無視する<indexterm>
+          <primary>filters</primary>
+
+          <secondary>comments</secondary>
+        </indexterm></title>
+
+      <!--Just guessing what this does - ask a developer.-->
+
+      <itemizedlist>
+        <listitem>
+          <para><option>無効</option>(デフォルト): WinMerge は、他の内容と一緒に、コード中のコメントを比較します。
+          </para>
+        </listitem>
+
+        <listitem>
+          <para><option>有効</option>: このオプションは、(C++ や Java
+          のような)プログラミング言語のコメントを検出し、それらを無視することにより、
+          比較を最適化します。</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+
+    <section>
       <title>移動ブロックの検出を有効にする<indexterm>
           <primary>moved differences</primary>
         </indexterm></title>
@@ -676,29 +699,6 @@
         </listitem>
       </itemizedlist>
     </section>
-
-    <section>
-      <title>フィルタコメント<indexterm>
-          <primary>filters</primary>
-
-          <secondary>comments</secondary>
-        </indexterm></title>
-
-      <!--Just guessing what this does - ask a developer.-->
-
-      <itemizedlist>
-        <listitem>
-          <para><option>無効</option>(デフォルト): WinMerge は、他の内容と一緒に、コード中のコメントを比較します。
-          </para>
-        </listitem>
-
-        <listitem>
-          <para><option>有効</option>: このオプションは、(C++ や Java
-          のような)プログラミング言語のコメントを検出し、それらを無視することにより、
-          比較を最適化します。</para>
-        </listitem>
-      </itemizedlist>
-    </section>
   </section>
        
   <section id="Configuration_compare_folder">

diff --git a/Src/Merge.rc b/Src/Merge.rc
index c18d066..171214b 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1346,13 +1346,12 @@ BEGIN
     CONTROL         "Igno&re carriage return differences (Windows/Unix/Mac)",IDC_EOL_SENSITIVE,\r
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,84,239,10\r
     CONTROL         "Ignore codepage &differences",IDC_CP_SENSITIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,96,239,10\r
-    CONTROL         "E&nable moved block detection",IDC_MOVED_BLOCKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,108,239,10\r
-    CONTROL         "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,239,10\r
-    LTEXT           "Diff &algorithm (Experimental):",IDC_STATIC,7,132,239,10\r
-    COMBOBOX        IDC_DIFF_ALGORITHM,6,144,240,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
-    CONTROL         "Enable indent &heuristic",IDC_INDENT_HEURISTIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,162,239,10\r
-    GROUPBOX        "Comments",IDC_STATIC,6,180,241,32\r
-    CONTROL         "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,193,226,10\r
+    CONTROL         "Ignore c&omment differences",IDC_FILTERCOMMENTS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,108,239,10\r
+    CONTROL         "E&nable moved block detection",IDC_MOVED_BLOCKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,239,10\r
+    CONTROL         "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,132,239,10\r
+    LTEXT           "Diff &algorithm (Experimental):",IDC_STATIC,7,144,239,10\r
+    COMBOBOX        IDC_DIFF_ALGORITHM,6,156,240,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
+    CONTROL         "Enable indent &heuristic",IDC_INDENT_HEURISTIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,174,239,10\r
     PUSHBUTTON      "Defaults",IDC_COMPARE_DEFAULTS,161,228,88,14\r
 END\r
 \r

diff --git a/Translations/TranslationsStatus.html b/Translations/TranslationsStatus.html
index 22054f9..05db3ab 100644 (file)
--- a/Translations/TranslationsStatus.html
+++ b/Translations/TranslationsStatus.html
@@ -33,7 +33,7 @@
 </head>
 <body>
 <h1>Translations Status</h1>
-<p>Status from <strong>2020-11-13</strong>:</p>
+<p>Status from <strong>2020-11-15</strong>:</p>
 <h2>WinMerge</h2>
 <table class="status">
   <tr>
@@ -46,290 +46,290 @@
   </tr>
   <tr>
     <td class="left">Arabic</td>
-    <td class="right">995</td>
-    <td class="right">925</td>
+    <td class="right">994</td>
+    <td class="right">923</td>
     <td class="right">0</td>
-    <td class="right">70</td>
+    <td class="right">71</td>
     <td class="center">2019-12-30</td>
   </tr>
   <tr>
     <td class="left">Basque</td>
-    <td class="right">995</td>
-    <td class="right">658</td>
+    <td class="right">994</td>
+    <td class="right">656</td>
     <td class="right">0</td>
-    <td class="right">337</td>
+    <td class="right">338</td>
     <td class="center">2013-02-03</td>
   </tr>
   <tr>
     <td class="left">Brazilian</td>
-    <td class="right">995</td>
-    <td class="right">989</td>
+    <td class="right">994</td>
+    <td class="right">987</td>
     <td class="right">0</td>
-    <td class="right">6</td>
+    <td class="right">7</td>
     <td class="center">2020-07-26</td>
   </tr>
   <tr>
     <td class="left">Bulgarian</td>
-    <td class="right">995</td>
-    <td class="right">893</td>
+    <td class="right">994</td>
+    <td class="right">891</td>
     <td class="right">0</td>
-    <td class="right">102</td>
+    <td class="right">103</td>
     <td class="center">2019-10-24</td>
   </tr>
   <tr>
     <td class="left">Catalan</td>
-    <td class="right">995</td>
-    <td class="right">582</td>
+    <td class="right">994</td>
+    <td class="right">580</td>
     <td class="right">0</td>
-    <td class="right">413</td>
+    <td class="right">414</td>
     <td class="center"></td>
   </tr>
   <tr>
     <td class="left">ChineseSimplified</td>
-    <td class="right">995</td>
-    <td class="right">995</td>
-    <td class="right">0</td>
+    <td class="right">994</td>
+    <td class="right">993</td>
     <td class="right">0</td>
+    <td class="right">1</td>
     <td class="center"></td>
   </tr>
   <tr>
     <td class="left">ChineseTraditional</td>
-    <td class="right">995</td>
-    <td class="right">877</td>
+    <td class="right">994</td>
+    <td class="right">875</td>
     <td class="right">0</td>
-    <td class="right">118</td>
+    <td class="right">119</td>
     <td class="center">2010-02-19</td>
   </tr>
   <tr>
     <td class="left">Croatian</td>
-    <td class="right">995</td>
-    <td class="right">649</td>
+    <td class="right">994</td>
+    <td class="right">647</td>
     <td class="right">1</td>
-    <td class="right">345</td>
+    <td class="right">346</td>
     <td class="center">2009-02-13</td>
   </tr>
   <tr>
     <td class="left">Czech</td>
-    <td class="right">995</td>
-    <td class="right">620</td>
+    <td class="right">994</td>
+    <td class="right">618</td>
     <td class="right">0</td>
-    <td class="right">375</td>
+    <td class="right">376</td>
     <td class="center"></td>
   </tr>
   <tr>
     <td class="left">Danish</td>
-    <td class="right">995</td>
-    <td class="right">658</td>
+    <td class="right">994</td>
+    <td class="right">656</td>
     <td class="right">0</td>
-    <td class="right">337</td>
+    <td class="right">338</td>
     <td class="center">2013-01-13</td>
   </tr>
   <tr>
     <td class="left">Dutch</td>
-    <td class="right">995</td>
-    <td class="right">916</td>
+    <td class="right">994</td>
+    <td class="right">914</td>
     <td class="right">0</td>
-    <td class="right">79</td>
+    <td class="right">80</td>
     <td class="center">2018-09-06</td>
   </tr>
   <tr>
     <td class="left">English</td>
-    <td class="right">995</td>
-    <td class="right">995</td>
+    <td class="right">994</td>
+    <td class="right">994</td>
     <td class="right">0</td>
     <td class="right">0</td>
-    <td class="center">2020-10-18</td>
+    <td class="center">2020-11-15</td>
   </tr>
   <tr>
     <td class="left">Finnish</td>
-    <td class="right">995</td>
-    <td class="right">922</td>
+    <td class="right">994</td>
+    <td class="right">920</td>
     <td class="right">0</td>
-    <td class="right">73</td>
+    <td class="right">74</td>
     <td class="center"></td>
   </tr>
   <tr>
     <td class="left">French</td>
-    <td class="right">995</td>
-    <td class="right">915</td>
+    <td class="right">994</td>
+    <td class="right">913</td>
     <td class="right">2</td>
-    <td class="right">78</td>
+    <td class="right">79</td>
     <td class="center">2019-06-02</td>
   </tr>
   <tr>
     <td class="left">Galician</td>
-    <td class="right">995</td>
     <td class="right">994</td>
+    <td class="right">992</td>
     <td class="right">0</td>
-    <td class="right">1</td>
+    <td class="right">2</td>
     <td class="center">2020-10-17</td>
   </tr>
   <tr>
     <td class="left">German</td>
-    <td class="right">995</td>
-    <td class="right">987</td>
+    <td class="right">994</td>
+    <td class="right">985</td>
     <td class="right">7</td>
-    <td class="right">1</td>
+    <td class="right">2</td>
     <td class="center">2020-09-28</td>
   </tr>
   <tr>
     <td class="left">Greek</td>
-    <td class="right">995</td>
-    <td class="right">621</td>
+    <td class="right">994</td>
+    <td class="right">619</td>
     <td class="right">0</td>
-    <td class="right">374</td>
+    <td class="right">375</td>
     <td class="center"></td>
   </tr>
   <tr>
     <td class="left">Hungarian</td>
-    <td class="right">995</td>
-    <td class="right">553</td>
+    <td class="right">994</td>
+    <td class="right">552</td>
     <td class="right">0</td>
     <td class="right">442</td>
     <td class="center">2011-01-24</td>
   </tr>
   <tr>
     <td class="left">Italian</td>
-    <td class="right">995</td>
-    <td class="right">925</td>
+    <td class="right">994</td>
+    <td class="right">923</td>
     <td class="right">0</td>
-    <td class="right">70</td>
+    <td class="right">71</td>
     <td class="center">2019-07-12</td>
   </tr>
   <tr>
     <td class="left">Japanese</td>
-    <td class="right">995</td>
-    <td class="right">984</td>
+    <td class="right">994</td>
+    <td class="right">983</td>
     <td class="right">0</td>
     <td class="right">11</td>
     <td class="center">2020-10-10</td>
   </tr>
   <tr>
     <td class="left">Korean</td>
-    <td class="right">995</td>
-    <td class="right">881</td>
+    <td class="right">994</td>
+    <td class="right">879</td>
     <td class="right">0</td>
-    <td class="right">114</td>
+    <td class="right">115</td>
     <td class="center">2018-02-05</td>
   </tr>
   <tr>
     <td class="left">Lithuanian</td>
-    <td class="right">995</td>
     <td class="right">994</td>
+    <td class="right">992</td>
     <td class="right">0</td>
-    <td class="right">1</td>
+    <td class="right">2</td>
     <td class="center">2020-10-12</td>
   </tr>
   <tr>
     <td class="left">Norwegian</td>
-    <td class="right">995</td>
-    <td class="right">650</td>
+    <td class="right">994</td>
+    <td class="right">648</td>
     <td class="right">0</td>
-    <td class="right">345</td>
+    <td class="right">346</td>
     <td class="center"></td>
   </tr>
   <tr>
     <td class="left">Persian</td>
-    <td class="right">995</td>
-    <td class="right">661</td>
+    <td class="right">994</td>
+    <td class="right">659</td>
     <td class="right">0</td>
-    <td class="right">334</td>
+    <td class="right">335</td>
     <td class="center">2013-08-15</td>
   </tr>
   <tr>
     <td class="left">Polish</td>
-    <td class="right">995</td>
-    <td class="right">964</td>
+    <td class="right">994</td>
+    <td class="right">962</td>
     <td class="right">0</td>
-    <td class="right">31</td>
+    <td class="right">32</td>
     <td class="center"></td>
   </tr>
   <tr>
     <td class="left">Portuguese</td>
-    <td class="right">995</td>
-    <td class="right">995</td>
-    <td class="right">0</td>
+    <td class="right">994</td>
+    <td class="right">993</td>
     <td class="right">0</td>
+    <td class="right">1</td>
     <td class="center">2020-10-26</td>
   </tr>
   <tr>
     <td class="left">Romanian</td>
-    <td class="right">995</td>
-    <td class="right">579</td>
+    <td class="right">994</td>
+    <td class="right">577</td>
     <td class="right">44</td>
-    <td class="right">372</td>
+    <td class="right">373</td>
     <td class="center"></td>
   </tr>
   <tr>
     <td class="left">Russian</td>
-    <td class="right">995</td>
-    <td class="right">982</td>
+    <td class="right">994</td>
+    <td class="right">980</td>
     <td class="right">0</td>
-    <td class="right">13</td>
+    <td class="right">14</td>
     <td class="center">2020-07-28</td>
   </tr>
   <tr>
     <td class="left">Serbian</td>
-    <td class="right">995</td>
-    <td class="right">649</td>
+    <td class="right">994</td>
+    <td class="right">647</td>
     <td class="right">0</td>
-    <td class="right">346</td>
+    <td class="right">347</td>
     <td class="center"></td>
   </tr>
   <tr>
     <td class="left">Sinhala</td>
-    <td class="right">995</td>
-    <td class="right">575</td>
-    <td class="right">67</td>
-    <td class="right">353</td>
+    <td class="right">994</td>
+    <td class="right">574</td>
+    <td class="right">66</td>
+    <td class="right">354</td>
     <td class="center">2010-12-12</td>
   </tr>
   <tr>
     <td class="left">Slovak</td>
-    <td class="right">995</td>
-    <td class="right">995</td>
-    <td class="right">0</td>
+    <td class="right">994</td>
+    <td class="right">993</td>
     <td class="right">0</td>
+    <td class="right">1</td>
     <td class="center">2020-11-02</td>
   </tr>
   <tr>
     <td class="left">Slovenian</td>
-    <td class="right">995</td>
-    <td class="right">993</td>
+    <td class="right">994</td>
+    <td class="right">991</td>
     <td class="right">0</td>
-    <td class="right">2</td>
+    <td class="right">3</td>
     <td class="center">2020-11-08</td>
   </tr>
   <tr>
     <td class="left">Spanish</td>
-    <td class="right">995</td>
-    <td class="right">890</td>
+    <td class="right">994</td>
+    <td class="right">888</td>
     <td class="right">0</td>
-    <td class="right">105</td>
+    <td class="right">106</td>
     <td class="center">2020-04-03</td>
   </tr>
   <tr>
     <td class="left">Swedish</td>
-    <td class="right">995</td>
-    <td class="right">925</td>
+    <td class="right">994</td>
+    <td class="right">923</td>
     <td class="right">0</td>
-    <td class="right">70</td>
+    <td class="right">71</td>
     <td class="center">2019-10-07</td>
   </tr>
   <tr>
     <td class="left">Turkish</td>
-    <td class="right">995</td>
-    <td class="right">992</td>
+    <td class="right">994</td>
+    <td class="right">990</td>
     <td class="right">0</td>
-    <td class="right">3</td>
+    <td class="right">4</td>
     <td class="center">2020-09-08</td>
   </tr>
   <tr>
     <td class="left">Ukrainian</td>
-    <td class="right">995</td>
-    <td class="right">655</td>
+    <td class="right">994</td>
+    <td class="right">653</td>
     <td class="right">0</td>
-    <td class="right">340</td>
+    <td class="right">341</td>
     <td class="center">2009-06-13</td>
   </tr>
 </table>

diff --git a/Translations/TranslationsStatus.xml b/Translations/TranslationsStatus.xml
index d60b897..d6dd050 100644 (file)
--- a/Translations/TranslationsStatus.xml
+++ b/Translations/TranslationsStatus.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <status>
-  <update>2020-11-13</update>
+  <update>2020-11-15</update>
   <translations project="WinMerge">
     <translation>
       <language>Arabic</language>
       <file>Arabic.po</file>
       <update>2019-12-30</update>
       <strings>
-        <count>995</count>
-        <translated>925</translated>
+        <count>994</count>
+        <translated>923</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>70</untranslated>
+        <untranslated>71</untranslated>
       </strings>
     </translation>
     <translation>
@@ -18,10 +18,10 @@
       <file>Basque.po</file>
       <update>2013-02-03</update>
       <strings>
-        <count>995</count>
-        <translated>658</translated>
+        <count>994</count>
+        <translated>656</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>337</untranslated>
+        <untranslated>338</untranslated>
       </strings>
       <translators>
         <translator>
@@ -35,10 +35,10 @@
       <file>Brazilian.po</file>
       <update>2020-07-26</update>
       <strings>
-        <count>995</count>
-        <translated>989</translated>
+        <count>994</count>
+        <translated>987</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>6</untranslated>
+        <untranslated>7</untranslated>
       </strings>
       <translators>
         <translator>
@@ -60,10 +60,10 @@
       <file>Bulgarian.po</file>
       <update>2019-10-24</update>
       <strings>
-        <count>995</count>
-        <translated>893</translated>
+        <count>994</count>
+        <translated>891</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>102</untranslated>
+        <untranslated>103</untranslated>
       </strings>
       <translators>
         <translator>
@@ -85,10 +85,10 @@
       <file>Catalan.po</file>
       <update></update>
       <strings>
-        <count>995</count>
-        <translated>582</translated>
+        <count>994</count>
+        <translated>580</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>413</untranslated>
+        <untranslated>414</untranslated>
       </strings>
       <translators>
         <translator>
@@ -102,10 +102,10 @@
       <file>ChineseSimplified.po</file>
       <update></update>
       <strings>
-        <count>995</count>
-        <translated>995</translated>
+        <count>994</count>
+        <translated>993</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>0</untranslated>
+        <untranslated>1</untranslated>
       </strings>
       <translators>
         <translator>
@@ -127,10 +127,10 @@
       <file>ChineseTraditional.po</file>
       <update>2010-02-19</update>
       <strings>
-        <count>995</count>
-        <translated>877</translated>
+        <count>994</count>
+        <translated>875</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>118</untranslated>
+        <untranslated>119</untranslated>
       </strings>
       <translators>
         <translator>
@@ -152,10 +152,10 @@
       <file>Croatian.po</file>
       <update>2009-02-13</update>
       <strings>
-        <count>995</count>
-        <translated>649</translated>
+        <count>994</count>
+        <translated>647</translated>
         <fuzzy>1</fuzzy>
-        <untranslated>345</untranslated>
+        <untranslated>346</untranslated>
       </strings>
       <translators>
         <translator>
@@ -169,10 +169,10 @@
       <file>Czech.po</file>
       <update></update>
       <strings>
-        <count>995</count>
-        <translated>620</translated>
+        <count>994</count>
+        <translated>618</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>375</untranslated>
+        <untranslated>376</untranslated>
       </strings>
       <translators>
         <translator>
@@ -190,10 +190,10 @@
       <file>Danish.po</file>
       <update>2013-01-13</update>
       <strings>
-        <count>995</count>
-        <translated>658</translated>
+        <count>994</count>
+        <translated>656</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>337</untranslated>
+        <untranslated>338</untranslated>
       </strings>
       <translators>
         <translator>
@@ -211,10 +211,10 @@
       <file>Dutch.po</file>
       <update>2018-09-06</update>
       <strings>
-        <count>995</count>
-        <translated>916</translated>
+        <count>994</count>
+        <translated>914</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>79</untranslated>
+        <untranslated>80</untranslated>
       </strings>
       <translators>
         <translator>
@@ -232,10 +232,10 @@
     <translation template="1">
       <language>English</language>
       <file>English.pot</file>
-      <update>2020-10-18</update>
+      <update>2020-11-15</update>
       <strings>
-        <count>995</count>
-        <translated>995</translated>
+        <count>994</count>
+        <translated>994</translated>
         <fuzzy>0</fuzzy>
         <untranslated>0</untranslated>
       </strings>
@@ -245,10 +245,10 @@
       <file>Finnish.po</file>
       <update></update>
       <strings>
-        <count>995</count>
-        <translated>922</translated>
+        <count>994</count>
+        <translated>920</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>73</untranslated>
+        <untranslated>74</untranslated>
       </strings>
     </translation>
     <translation>
@@ -256,10 +256,10 @@
       <file>French.po</file>
       <update>2019-06-02</update>
       <strings>
-        <count>995</count>
-        <translated>915</translated>
+        <count>994</count>
+        <translated>913</translated>
         <fuzzy>2</fuzzy>
-        <untranslated>78</untranslated>
+        <untranslated>79</untranslated>
       </strings>
       <translators>
         <translator maintainer="1">
@@ -285,10 +285,10 @@
       <file>Galician.po</file>
       <update>2020-10-17</update>
       <strings>
-        <count>995</count>
-        <translated>994</translated>
+        <count>994</count>
+        <translated>992</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>1</untranslated>
+        <untranslated>2</untranslated>
       </strings>
       <translators>
         <translator>
@@ -302,10 +302,10 @@
       <file>German.po</file>
       <update>2020-09-28</update>
       <strings>
-        <count>995</count>
-        <translated>987</translated>
+        <count>994</count>
+        <translated>985</translated>
         <fuzzy>7</fuzzy>
-        <untranslated>1</untranslated>
+        <untranslated>2</untranslated>
       </strings>
       <translators>
         <translator maintainer="1">
@@ -327,10 +327,10 @@
       <file>Greek.po</file>
       <update></update>
       <strings>
-        <count>995</count>
-        <translated>621</translated>
+        <count>994</count>
+        <translated>619</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>374</untranslated>
+        <untranslated>375</untranslated>
       </strings>
       <translators>
         <translator>
@@ -344,8 +344,8 @@
       <file>Hungarian.po</file>
       <update>2011-01-24</update>
       <strings>
-        <count>995</count>
-        <translated>553</translated>
+        <count>994</count>
+        <translated>552</translated>
         <fuzzy>0</fuzzy>
         <untranslated>442</untranslated>
       </strings>
@@ -365,10 +365,10 @@
       <file>Italian.po</file>
       <update>2019-07-12</update>
       <strings>
-        <count>995</count>
-        <translated>925</translated>
+        <count>994</count>
+        <translated>923</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>70</untranslated>
+        <untranslated>71</untranslated>
       </strings>
       <translators>
         <translator>
@@ -394,8 +394,8 @@
       <file>Japanese.po</file>
       <update>2020-10-10</update>
       <strings>
-        <count>995</count>
-        <translated>984</translated>
+        <count>994</count>
+        <translated>983</translated>
         <fuzzy>0</fuzzy>
         <untranslated>11</untranslated>
       </strings>
@@ -411,10 +411,10 @@
       <file>Korean.po</file>
       <update>2018-02-05</update>
       <strings>
-        <count>995</count>
-        <translated>881</translated>
+        <count>994</count>
+        <translated>879</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>114</untranslated>
+        <untranslated>115</untranslated>
       </strings>
       <translators>
         <translator>
@@ -440,10 +440,10 @@
       <file>Lithuanian.po</file>
       <update>2020-10-12</update>
       <strings>
-        <count>995</count>
-        <translated>994</translated>
+        <count>994</count>
+        <translated>992</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>1</untranslated>
+        <untranslated>2</untranslated>
       </strings>
       <translators>
         <translator>
@@ -457,10 +457,10 @@
       <file>Norwegian.po</file>
       <update></update>
       <strings>
-        <count>995</count>
-        <translated>650</translated>
+        <count>994</count>
+        <translated>648</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>345</untranslated>
+        <untranslated>346</untranslated>
       </strings>
       <translators>
         <translator>
@@ -478,10 +478,10 @@
       <file>Persian.po</file>
       <update>2013-08-15</update>
       <strings>
-        <count>995</count>
-        <translated>661</translated>
+        <count>994</count>
+        <translated>659</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>334</untranslated>
+        <untranslated>335</untranslated>
       </strings>
       <translators>
         <translator>
@@ -495,10 +495,10 @@
       <file>Polish.po</file>
       <update></update>
       <strings>
-        <count>995</count>
-        <translated>964</translated>
+        <count>994</count>
+        <translated>962</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>31</untranslated>
+        <untranslated>32</untranslated>
       </strings>
       <translators>
         <translator>
@@ -523,10 +523,10 @@
       <file>Portuguese.po</file>
       <update>2020-10-26</update>
       <strings>
-        <count>995</count>
-        <translated>995</translated>
+        <count>994</count>
+        <translated>993</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>0</untranslated>
+        <untranslated>1</untranslated>
       </strings>
       <translators>
         <translator>
@@ -546,10 +546,10 @@
       <file>Romanian.po</file>
       <update></update>
       <strings>
-        <count>995</count>
-        <translated>579</translated>
+        <count>994</count>
+        <translated>577</translated>
         <fuzzy>44</fuzzy>
-        <untranslated>372</untranslated>
+        <untranslated>373</untranslated>
       </strings>
       <translators>
         <translator>
@@ -563,10 +563,10 @@
       <file>Russian.po</file>
       <update>2020-07-28</update>
       <strings>
-        <count>995</count>
-        <translated>982</translated>
+        <count>994</count>
+        <translated>980</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>13</untranslated>
+        <untranslated>14</untranslated>
       </strings>
       <translators>
         <translator>
@@ -596,10 +596,10 @@
       <file>Serbian.po</file>
       <update></update>
       <strings>
-        <count>995</count>
-        <translated>649</translated>
+        <count>994</count>
+        <translated>647</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>346</untranslated>
+        <untranslated>347</untranslated>
       </strings>
       <translators>
         <translator>
@@ -613,10 +613,10 @@
       <file>Sinhala.po</file>
       <update>2010-12-12</update>
       <strings>
-        <count>995</count>
-        <translated>575</translated>
-        <fuzzy>67</fuzzy>
-        <untranslated>353</untranslated>
+        <count>994</count>
+        <translated>574</translated>
+        <fuzzy>66</fuzzy>
+        <untranslated>354</untranslated>
       </strings>
       <translators>
         <translator>
@@ -629,10 +629,10 @@
       <file>Slovak.po</file>
       <update>2020-11-02</update>
       <strings>
-        <count>995</count>
-        <translated>995</translated>
+        <count>994</count>
+        <translated>993</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>0</untranslated>
+        <untranslated>1</untranslated>
       </strings>
       <translators>
         <translator>
@@ -654,10 +654,10 @@
       <file>Slovenian.po</file>
       <update>2020-11-08</update>
       <strings>
-        <count>995</count>
-        <translated>993</translated>
+        <count>994</count>
+        <translated>991</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>2</untranslated>
+        <untranslated>3</untranslated>
       </strings>
       <translators>
         <translator>
@@ -679,10 +679,10 @@
       <file>Spanish.po</file>
       <update>2020-04-03</update>
       <strings>
-        <count>995</count>
-        <translated>890</translated>
+        <count>994</count>
+        <translated>888</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>105</untranslated>
+        <untranslated>106</untranslated>
       </strings>
       <translators>
         <translator>
@@ -708,10 +708,10 @@
       <file>Swedish.po</file>
       <update>2019-10-07</update>
       <strings>
-        <count>995</count>
-        <translated>925</translated>
+        <count>994</count>
+        <translated>923</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>70</untranslated>
+        <untranslated>71</untranslated>
       </strings>
       <translators>
         <translator>
@@ -733,10 +733,10 @@
       <file>Turkish.po</file>
       <update>2020-09-08</update>
       <strings>
-        <count>995</count>
-        <translated>992</translated>
+        <count>994</count>
+        <translated>990</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>3</untranslated>
+        <untranslated>4</untranslated>
       </strings>
       <translators>
         <translator>
@@ -758,10 +758,10 @@
       <file>Ukrainian.po</file>
       <update>2009-06-13</update>
       <strings>
-        <count>995</count>
-        <translated>655</translated>
+        <count>994</count>
+        <translated>653</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>340</untranslated>
+        <untranslated>341</untranslated>
       </strings>
       <translators>
         <translator>

diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po
index 4316175..5e0b696 100644 (file)
--- a/Translations/WinMerge/Arabic.po
+++ b/Translations/WinMerge/Arabic.po
@@ -1316,6 +1316,9 @@ msgstr "تجاهل الأسطر الفارغة"
 msgid "Ignore &case"
 msgstr "تجاهل حالة الحرف (للغة الإنجليزية)"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 msgid "E&nable moved block detection"
 msgstr "&تفعيل كشف المجموعات التي نقلها"
 
@@ -1328,12 +1331,6 @@ msgstr "خوارزمية المقارنة (تجريبي):"
 msgid "Enable indent &heuristic"
 msgstr "تفعيل الم&سافة البادئة الإرشادية"
 
-msgid "Comments"
-msgstr "تعليقات"
-
-msgid "Filter Comments"
-msgstr "مرشح التعليقات"
-
 msgid "Editor"
 msgstr "المحرر"
 

diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index 38e9d1c..b8c407f 100644 (file)
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -1684,6 +1684,9 @@ msgstr "Ezikusi &lerro zuriak"
 msgid "Ignore &case"
 msgstr "Ezikusi &kasua"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "E&nable moved block detection"
 msgstr "Gaitu bloke &mugitu atzematea"
@@ -1699,14 +1702,6 @@ msgid "Enable indent &heuristic"
 msgstr ""
 
 #, c-format
-msgid "Comments"
-msgstr "Aipamenak"
-
-#, c-format
-msgid "Filter Comments"
-msgstr "&Iragazki Aipamenak"
-
-#, c-format
 msgid "Editor"
 msgstr "Editatzailea"
 

diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
index ee0c337..4415a92 100644 (file)
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -1683,6 +1683,9 @@ msgstr "Ignorar as linha&s em branco"
 msgid "Ignore &case"
 msgstr "Ignorar &caso sensitivo"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "E&nable moved block detection"
 msgstr "A&tivar a detecção dos blocos movidos"
@@ -1698,14 +1701,6 @@ msgid "Enable indent &heuristic"
 msgstr "Ativar &heurística de recuo"
 
 #, c-format
-msgid "Comments"
-msgstr "Comentários"
-
-#, c-format
-msgid "Filter Comments"
-msgstr "Comentários do Filtro"
-
-#, c-format
 msgid "Editor"
 msgstr "Editor"
 

diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index 244e2b4..29d1621 100644 (file)
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -1310,6 +1310,9 @@ msgstr "Пренебрегване на пра&зните редове"
 msgid "Ignore &case"
 msgstr "Пренебре&гване на регистъра"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 msgid "E&nable moved block detection"
 msgstr "Разпознаване на преместени па&раграфи"
 
@@ -1322,12 +1325,6 @@ msgstr "&Алгоритъм за различия (експер.):"
 msgid "Enable indent &heuristic"
 msgstr "П&редполагане на отстъпа"
 
-msgid "Comments"
-msgstr "Коментари"
-
-msgid "Filter Comments"
-msgstr "Филтър за коментари"
-
 msgid "Editor"
 msgstr "Редактор"
 

diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index b8e6a3e..c5b2d86 100644 (file)
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -1682,6 +1682,9 @@ msgstr "&Ignora les línies en blanc"
 msgid "Ignore &case"
 msgstr "Ignora &majúscules/minúscules"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "E&nable moved block detection"
 msgstr "&Habilita detecció de blocs desplaçats"
@@ -1697,14 +1700,6 @@ msgid "Enable indent &heuristic"
 msgstr ""
 
 #, c-format
-msgid "Comments"
-msgstr "Comentaris"
-
-#, c-format
-msgid "Filter Comments"
-msgstr "&Filtra els comentaris"
-
-#, c-format
 msgid "Editor"
 msgstr ""
 

diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index bcda169..7975e29 100644 (file)
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -1317,6 +1317,9 @@ msgstr "忽略空行(&K)"
 msgid "Ignore &case"
 msgstr "忽略大小写(&C)"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 msgid "E&nable moved block detection"
 msgstr "启用块移动检测(&N)"
 
@@ -1329,12 +1332,6 @@ msgstr "比较算法 (实验性) (&A):"
 msgid "Enable indent &heuristic"
 msgstr "启用启发式缩进(&H)"
 
-msgid "Comments"
-msgstr "注释"
-
-msgid "Filter Comments"
-msgstr "过滤注释"
-
 msgid "Editor"
 msgstr "编辑器"
 

diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index ec59b74..3da983f 100644 (file)
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -1693,6 +1693,9 @@ msgstr "忽略空白行(&K)"
 msgid "Ignore &case"
 msgstr "忽略大小寫(&C)"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "E&nable moved block detection"
 msgstr "偵測移位的區塊(&N)"
@@ -1708,14 +1711,6 @@ msgid "Enable indent &heuristic"
 msgstr ""
 
 #, c-format
-msgid "Comments"
-msgstr "備註"
-
-#, c-format
-msgid "Filter Comments"
-msgstr "篩選器註解"
-
-#, c-format
 msgid "Editor"
 msgstr "編輯器"
 

diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
index c97e831..305fef6 100644 (file)
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -1683,6 +1683,9 @@ msgstr "Zanemari prazne &retke"
 msgid "Ignore &case"
 msgstr "Zanemari V/m &slova"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "E&nable moved block detection"
 msgstr "Omogući &razlikovanje premještenih blokova"
@@ -1698,14 +1701,6 @@ msgid "Enable indent &heuristic"
 msgstr ""
 
 #, c-format
-msgid "Comments"
-msgstr "Komentari"
-
-#, c-format
-msgid "Filter Comments"
-msgstr "Filtriraj komentare"
-
-#, c-format
 msgid "Editor"
 msgstr "Uređivanje"
 

diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index c11769d..b657992 100644 (file)
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -1685,6 +1685,9 @@ msgstr "Ignorovat prázdné řá&dky"
 msgid "Ignore &case"
 msgstr "Ignorovat &malá a velká písmena"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "E&nable moved block detection"
 msgstr "Povolit zjišťování přesunutých &bloků"
@@ -1700,14 +1703,6 @@ msgid "Enable indent &heuristic"
 msgstr ""
 
 #, c-format
-msgid "Comments"
-msgstr "Komentáře"
-
-#, c-format
-msgid "Filter Comments"
-msgstr "Filtrovat kom&entáře"
-
-#, c-format
 msgid "Editor"
 msgstr ""
 

diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index c5b6fec..a422c70 100644 (file)
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -1686,6 +1686,9 @@ msgstr "Ignorer blan&ke linjer"
 msgid "Ignore &case"
 msgstr "Ignorer store/små &bogstaver"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "E&nable moved block detection"
 msgstr "&Aktiver detektion af flyttede blokke"
@@ -1701,14 +1704,6 @@ msgid "Enable indent &heuristic"
 msgstr ""
 
 #, c-format
-msgid "Comments"
-msgstr "Kommentarer"
-
-#, c-format
-msgid "Filter Comments"
-msgstr "Filter Kommentarer"
-
-#, c-format
 msgid "Editor"
 msgstr "Redigering"
 

diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index 4087b6b..b9da1cb 100644 (file)
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -1315,6 +1315,9 @@ msgstr "Lege regels negeren"
 msgid "Ignore &case"
 msgstr "Niet hoofdlettergevoelig"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 msgid "E&nable moved block detection"
 msgstr "Detectie verplaatste blokken inschakelen"
 
@@ -1327,12 +1330,6 @@ msgstr "Vergelijkingsalgoritme (experimenteel):"
 msgid "Enable indent &heuristic"
 msgstr "Inspringing-heuristiek inschakelen"
 
-msgid "Comments"
-msgstr "Opmerkingen"
-
-msgid "Filter Comments"
-msgstr "Filter-opmerkingen"
-
 msgid "Editor"
 msgstr "Editor"
 

diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index 6a516e2..b4aa66d 100644 (file)
--- a/Translations/WinMerge/English.pot
+++ b/Translations/WinMerge/English.pot
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2020-10-18 17:28+0000\n"
+"POT-Creation-Date: 2020-11-15 10:49+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -1305,6 +1305,9 @@ msgstr ""
 msgid "Ignore &case"
 msgstr ""
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 msgid "E&nable moved block detection"
 msgstr ""
 
@@ -1317,12 +1320,6 @@ msgstr ""
 msgid "Enable indent &heuristic"
 msgstr ""
 
-msgid "Comments"
-msgstr ""
-
-msgid "Filter Comments"
-msgstr ""
-
 msgid "Editor"
 msgstr ""
 

diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po
index e4bc1ca..690ec83 100644 (file)
--- a/Translations/WinMerge/Finnish.po
+++ b/Translations/WinMerge/Finnish.po
@@ -1683,6 +1683,9 @@ msgstr "Ohita tyhjät rivit"
 msgid "Ignore &case"
 msgstr "Ohita kirjainkoko"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "E&nable moved block detection"
 msgstr "Ota siirretyn lohkon tunnistus käyttöön"
@@ -1698,14 +1701,6 @@ msgid "Enable indent &heuristic"
 msgstr "Ota käyttöön &heuristinen sisennys"
 
 #, c-format
-msgid "Comments"
-msgstr "Kommentit"
-
-#, c-format
-msgid "Filter Comments"
-msgstr "Suodatin kommentit"
-
-#, c-format
 msgid "Editor"
 msgstr "Muokkain"
 

diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
index 1c2d9f7..133c190 100644 (file)
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -1692,6 +1692,9 @@ msgstr "Ignorer les lignes &vides"
 msgid "Ignore &case"
 msgstr "Ignorer la ca&sse"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "E&nable moved block detection"
 msgstr "&Activer la détection des blocs déplacés"
@@ -1707,14 +1710,6 @@ msgid "Enable indent &heuristic"
 msgstr "Activer l'indentation &heuristique"
 
 #, c-format
-msgid "Comments"
-msgstr "Commentaires"
-
-#, c-format
-msgid "Filter Comments"
-msgstr "Filtrer les commentaires"
-
-#, c-format
 msgid "Editor"
 msgstr "Éditeur"
 

diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
index 10cbcbd..d67f051 100644 (file)
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -1683,6 +1683,9 @@ msgstr "Ignorar &liñas en branco"
 msgid "Ignore &case"
 msgstr "Ignorar maiúsculas e minúsculas"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "E&nable moved block detection"
 msgstr "A&ctivar detección de bloques movidos"
@@ -1698,14 +1701,6 @@ msgid "Enable indent &heuristic"
 msgstr "Activar sangrado &heurístico"
 
 #, c-format
-msgid "Comments"
-msgstr "Comentarios"
-
-#, c-format
-msgid "Filter Comments"
-msgstr "Filtrar comentarios"
-
-#, c-format
 msgid "Editor"
 msgstr "Editor"
 

diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
index 5712662..ffd61c3 100644 (file)
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -1683,6 +1683,9 @@ msgstr "&Leerzeilen ignorieren"
 msgid "Ignore &case"
 msgstr "&Groß-/Kleinschreibung ignorieren"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "E&nable moved block detection"
 msgstr "Verschobene &Blöcke erkennen"
@@ -1698,14 +1701,6 @@ msgid "Enable indent &heuristic"
 msgstr "&Heuristischen Einzug aktivieren"
 
 #, c-format
-msgid "Comments"
-msgstr "Kommentare"
-
-#, c-format
-msgid "Filter Comments"
-msgstr "&Kommentare filtern"
-
-#, c-format
 msgid "Editor"
 msgstr "Editor"
 

diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index 0ece748..0fff9ed 100644 (file)
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -1682,6 +1682,9 @@ msgstr "Οι &κενές γραμμές να αγνοούνται"
 msgid "Ignore &case"
 msgstr "Διάκριση μεταξύ Πεζών/&Κεφαλαίων ανενεργός"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "E&nable moved block detection"
 msgstr "Ενεργοποίηση ανι&χνεύσεως μετακινηθέντων τμημάτων"
@@ -1697,14 +1700,6 @@ msgid "Enable indent &heuristic"
 msgstr ""
 
 #, c-format
-msgid "Comments"
-msgstr "Σχόλια"
-
-#, c-format
-msgid "Filter Comments"
-msgstr "Σχόλια Φίλτρων"
-
-#, c-format
 msgid "Editor"
 msgstr "Επεξεργασία Κειμένου"
 

diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index 64b5ab2..2bef065 100644 (file)
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -1683,6 +1683,9 @@ msgstr "&Üres sorok kihagyása"
 msgid "Ignore &case"
 msgstr "&Kis-nagybetű különbségek kihagyása"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "E&nable moved block detection"
 msgstr "Mozgatott &blokk észlelés bekapcsolása"
@@ -1698,14 +1701,6 @@ msgid "Enable indent &heuristic"
 msgstr ""
 
 #, c-format
-msgid "Comments"
-msgstr "Megjegyzések"
-
-#, c-format
-msgid "Filter Comments"
-msgstr ""
-
-#, c-format
 msgid "Editor"
 msgstr "Szerkesztő"
 

diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index f6ce240..85fa4e1 100644 (file)
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -1313,6 +1313,9 @@ msgstr "Ign&ora le linee vuote"
 msgid "Ignore &case"
 msgstr "Ig&nora differenze maiuscole/minuscole"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 msgid "E&nable moved block detection"
 msgstr "Attiva rilevamento blocc&hi spostati"
 
@@ -1325,12 +1328,6 @@ msgstr "&Algoritmo differenze (sperimentale):"
 msgid "Enable indent &heuristic"
 msgstr "Abilita rientro &euristico"
 
-msgid "Comments"
-msgstr "Commenti"
-
-msgid "Filter Comments"
-msgstr "Filtra commenti"
-
 msgid "Editor"
 msgstr "Editor"
 

diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index 0a0deba..04f6b29 100644 (file)
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -1316,6 +1316,9 @@ msgstr "空行を無視する(&K)"
 msgid "Ignore &case"
 msgstr "大文字と小文字を区別しない(&C)"
 
+msgid "Ignore c&omment differences"
+msgstr "コメントの差異を無視する"
+
 msgid "E&nable moved block detection"
 msgstr "移動ブロック検出を有効にする(&N)"
 
@@ -1328,12 +1331,6 @@ msgstr "Diff アルゴリズム (実験的機能)(&A):"
 msgid "Enable indent &heuristic"
 msgstr "indent heuristic を有効にする(&H)"
 
-msgid "Comments"
-msgstr "コメント"
-
-msgid "Filter Comments"
-msgstr "コメントの差異を無視する"
-
 msgid "Editor"
 msgstr "エディタ"
 

diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index 297c8d8..1d9d07e 100644 (file)
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -1687,6 +1687,9 @@ msgstr "공백 줄 무시하기(&K)"
 msgid "Ignore &case"
 msgstr "대소문자 무시하기(&C)"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "E&nable moved block detection"
 msgstr "이동된 블럭 감지 사용하기"
@@ -1702,14 +1705,6 @@ msgid "Enable indent &heuristic"
 msgstr ""
 
 #, c-format
-msgid "Comments"
-msgstr "코멘트"
-
-#, c-format
-msgid "Filter Comments"
-msgstr "코멘트 필터링하기"
-
-#, c-format
 msgid "Editor"
 msgstr "편집기"
 

diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po
index 1e7b5b3..192a060 100644 (file)
--- a/Translations/WinMerge/Lithuanian.po
+++ b/Translations/WinMerge/Lithuanian.po
@@ -1314,6 +1314,9 @@ msgstr "Nepaisyti &tuščių eilučių"
 msgid "Ignore &case"
 msgstr "Nepaisyti raidžių &dydžio"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 msgid "E&nable moved block detection"
 msgstr "Įju&ngti perkeltų blokų aptikimą"
 
@@ -1326,12 +1329,6 @@ msgstr "Lyginimo &algoritmas (Bandymai):"
 msgid "Enable indent &heuristic"
 msgstr "Įgalinti &heuristinę įtrauką"
 
-msgid "Comments"
-msgstr "Komentarai"
-
-msgid "Filter Comments"
-msgstr "Filtro komentarai"
-
 msgid "Editor"
 msgstr "Redaktoriaus"
 

diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index 4fd0a39..cb4e995 100644 (file)
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -1683,6 +1683,9 @@ msgstr "Ignorer blan&ke linjer"
 msgid "Ignore &case"
 msgstr "Ignorer store/små &bokstaver"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "E&nable moved block detection"
 msgstr "&Aktiver flyttet blokk-oppdagelse"
@@ -1698,14 +1701,6 @@ msgid "Enable indent &heuristic"
 msgstr ""
 
 #, c-format
-msgid "Comments"
-msgstr "Kommentarer"
-
-#, c-format
-msgid "Filter Comments"
-msgstr "Filter-kommentarer"
-
-#, c-format
 msgid "Editor"
 msgstr "Redigering"
 

diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index ac77bc3..c815199 100644 (file)
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -1688,6 +1688,9 @@ msgstr "&k چشم پوشي از خطوط خالي "
 msgid "Ignore &case"
 msgstr "&c چشم پوشي از اندازه حروف "
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "E&nable moved block detection"
 msgstr "&n فعال کردن تشخيص قطعه جابجا شده "
@@ -1703,14 +1706,6 @@ msgid "Enable indent &heuristic"
 msgstr ""
 
 #, c-format
-msgid "Comments"
-msgstr " يادداشتها "
-
-#, c-format
-msgid "Filter Comments"
-msgstr " پالايه توضيحات "
-
-#, c-format
 msgid "Editor"
 msgstr "  ويراستار  "
 

diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
index a2a6072..bcdae63 100644 (file)
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -1311,6 +1311,9 @@ msgstr "Ignoruj puste linie"
 msgid "Ignore &case"
 msgstr "Ignoruj wielkości liter"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 msgid "E&nable moved block detection"
 msgstr "Włącz wykrywanie przeniesionych bloków"
 
@@ -1323,12 +1326,6 @@ msgstr "Algorytm różnicowy (eksperyment.):"
 msgid "Enable indent &heuristic"
 msgstr "Włącz heurystykę wcięcia"
 
-msgid "Comments"
-msgstr "Komentarze"
-
-msgid "Filter Comments"
-msgstr "Filtruj komentarze"
-
 msgid "Editor"
 msgstr "Edytor"
 

diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index e53b426..78c2d69 100644 (file)
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -1314,6 +1314,9 @@ msgstr "Ignorar linhas em branco"
 msgid "Ignore &case"
 msgstr "Ignorar maiúsculas/minúsculas"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 msgid "E&nable moved block detection"
 msgstr "Ativar deteção de bloco movido"
 
@@ -1326,12 +1329,6 @@ msgstr "Diff &algoritmo (Experimental):"
 msgid "Enable indent &heuristic"
 msgstr "Ativar travessão &heurístico"
 
-msgid "Comments"
-msgstr "Comentários"
-
-msgid "Filter Comments"
-msgstr "Filtrar comentários"
-
 msgid "Editor"
 msgstr "Editor"
 

diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
index 48fd643..f3bfa29 100644 (file)
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -1683,6 +1683,9 @@ msgstr "Ignoră li&nii goale"
 msgid "Ignore &case"
 msgstr "Ignoră minus&cule/majuscule"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "E&nable moved block detection"
 msgstr "Activea&ză detecţie blocuri mutate"
@@ -1698,14 +1701,6 @@ msgid "Enable indent &heuristic"
 msgstr ""
 
 #, c-format
-msgid "Comments"
-msgstr "Comentarii"
-
-#, c-format
-msgid "Filter Comments"
-msgstr "Comentarii filtre"
-
-#, c-format
 msgid "Editor"
 msgstr "Editor"
 

diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
index 1829ed3..f6365c5 100644 (file)
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -1316,6 +1316,9 @@ msgstr "Игнорировать пуст&ые строки"
 msgid "Ignore &case"
 msgstr "Игнорировать р&егистр"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 msgid "E&nable moved block detection"
 msgstr "Обнаружение переме&щенных блоков"
 
@@ -1328,12 +1331,6 @@ msgstr "Алгоритм сравнения (эксперимент.):"
 msgid "Enable indent &heuristic"
 msgstr "Включать эвристику отступов"
 
-msgid "Comments"
-msgstr "Комментарии"
-
-msgid "Filter Comments"
-msgstr "Фильтр комментариев"
-
 msgid "Editor"
 msgstr "Редактор"
 

diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po
index 2137a1b..8555065 100644 (file)
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -1666,6 +1666,9 @@ msgstr "Занемари пра&зне редове"
 msgid "Ignore &case"
 msgstr "Занемари под&ударност"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "E&nable moved block detection"
 msgstr "Омогући откривање премештених група"
@@ -1681,14 +1684,6 @@ msgid "Enable indent &heuristic"
 msgstr ""
 
 #, c-format
-msgid "Comments"
-msgstr "Напомене"
-
-#, c-format
-msgid "Filter Comments"
-msgstr "Филтрирај напомене"
-
-#, c-format
 msgid "Editor"
 msgstr "Уређивач"
 

diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po
index 05f5812..8b025da 100644 (file)
--- a/Translations/WinMerge/Sinhala.po
+++ b/Translations/WinMerge/Sinhala.po
@@ -1680,6 +1680,9 @@ msgstr "හිස් පේළි නොසලකා හරින්න"
 msgid "Ignore &case"
 msgstr "Ignore &case"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "E&nable moved block detection"
 msgstr "E&nable moved block detection"
@@ -1695,14 +1698,6 @@ msgid "Enable indent &heuristic"
 msgstr ""
 
 #, c-format
-msgid "Comments"
-msgstr "විවේචන"
-
-#, fuzzy, c-format
-msgid "Filter Comments"
-msgstr "Filter Comments"
-
-#, c-format
 msgid "Editor"
 msgstr "සම්පාදක"
 

diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po
index 2e453cb..3ca3918 100644 (file)
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -1318,6 +1318,9 @@ msgstr "Ignorovať prázdne riad&ky"
 msgid "Ignore &case"
 msgstr "Ignorovať m&alé/VEĽKÉ"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 msgid "E&nable moved block detection"
 msgstr "Povoliť &zisťovanie presunu bloku"
 
@@ -1330,12 +1333,6 @@ msgstr "&Algoritmus rozdielov (experimentálne):"
 msgid "Enable indent &heuristic"
 msgstr "Povoliť &heuristické odsadenie"
 
-msgid "Comments"
-msgstr "Komentáre"
-
-msgid "Filter Comments"
-msgstr "Filtrovať komentáre"
-
 msgid "Editor"
 msgstr "Editor"
 

diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po
index 9548953..1d1be7b 100644 (file)
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -1684,6 +1684,9 @@ msgstr "Prezri prazne &vrstice"
 msgid "Ignore &case"
 msgstr "Prezri &velikost znakov"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "E&nable moved block detection"
 msgstr "Omogoči Zazna&vanje premaknjenih blokov"
@@ -1698,14 +1701,6 @@ msgstr "Al&goritem razlik (eksperimen):"
 msgid "Enable indent &heuristic"
 msgstr "Omogoči &hevristični zamik"
 
-#, c-format
-msgid "Comments"
-msgstr "Komentarji"
-
-#, c-format
-msgid "Filter Comments"
-msgstr "Komentarji filtrov"
-
 msgid "Editor"
 msgstr "Urejevalnik"
 

diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po
index a734b4c..45e742d 100644 (file)
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -1317,6 +1317,9 @@ msgstr "Ignorar diferencias de líneas &vacías"
 msgid "Ignore &case"
 msgstr "Ignorar MAYÚSCULAS/minús&culas"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 msgid "E&nable moved block detection"
 msgstr "Habilitar detecció&n de bloques movidos"
 
@@ -1329,12 +1332,6 @@ msgstr ""
 msgid "Enable indent &heuristic"
 msgstr "Habilitar indentación &heuristica"
 
-msgid "Comments"
-msgstr "Comentarios"
-
-msgid "Filter Comments"
-msgstr "Filtrar comentarios"
-
 msgid "Editor"
 msgstr "Editor"
 

diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po
index 2a43cf4..8b5bf30 100644 (file)
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -1685,6 +1685,9 @@ msgstr "Åsidosätt blanka rader"
 msgid "Ignore &case"
 msgstr "Åsidosätt VERSAL/gemen skillnader"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "E&nable moved block detection"
 msgstr "Möjliggör urskiljning av flyttade block"
@@ -1700,14 +1703,6 @@ msgid "Enable indent &heuristic"
 msgstr "Möjliggör IndragUppfinningsrikhet"
 
 #, c-format
-msgid "Comments"
-msgstr "Kommentarer"
-
-#, c-format
-msgid "Filter Comments"
-msgstr "FilterKommentarer"
-
-#, c-format
 msgid "Editor"
 msgstr "Redigerare"
 

diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po
index d6f8f72..06ff485 100644 (file)
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -1313,6 +1313,9 @@ msgstr "Boş satırlar yo&k sayılsın"
 msgid "Ignore &case"
 msgstr "BÜYÜK-küçük &harf ayrımı yapılmasın"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 msgid "E&nable moved block detection"
 msgstr "Taşı&nmış blok algılaması kullanılsın"
 
@@ -1325,12 +1328,6 @@ msgstr "&Fark algortiması (Deneysel):"
 msgid "Enable indent &heuristic"
 msgstr "&Sezgisel girinti kullanılsın"
 
-msgid "Comments"
-msgstr "Açıklamalar"
-
-msgid "Filter Comments"
-msgstr "Açıklamalar süzülsün"
-
 msgid "Editor"
 msgstr "Düzenleyici"
 

diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po
index 7ffcec7..41b3468 100644 (file)
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -1684,6 +1684,9 @@ msgstr "Нехтувати порожніми &лініями"
 msgid "Ignore &case"
 msgstr "Нехтувати р&егістр"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 #, c-format
 msgid "E&nable moved block detection"
 msgstr "Виявлення перемі&щених блоків"
@@ -1699,14 +1702,6 @@ msgid "Enable indent &heuristic"
 msgstr ""
 
 #, c-format
-msgid "Comments"
-msgstr "Коментарі"
-
-#, c-format
-msgid "Filter Comments"
-msgstr "Фільтр коментарів"
-
-#, c-format
 msgid "Editor"
 msgstr "Редактор"