Update translations

Author: u-235

gcodeworkshop_top.pro

@@ -14,7 +14,6 @@ lupdateGCodeWorkShop.commands = lupdate $$PROJECT_ROOT_PATH/gcodeworkshop $$PROJ
 lupdateKdiff3.commands = lupdate $$PROJECT_ROOT_PATH/3rdparty/kdiff3  -ts $$tsFiles(kdiff3)
 
 QMAKE_EXTRA_TARGETS += lrelease
-lrelease.target = FORCE
 lrelease.commands = lrelease $$tsFiles(gcodeworkshop) $$tsFiles(kdiff3)
 
 translate.files = $$LANG_PATH/*.qm

lang/gcodeworkshop_ca.ts

@@ -4,110 +4,110 @@
 <context>
     <name>DiffTextWindow</name>
     <message>
-        <location filename="../3rdparty/kdiff3/difftextwindow.cpp" line="381"/>
+        <location filename="../3rdparty/kdiff3/difftextwindow.cpp" line="386"/>
         <source>File</source>
         <translation>Fitxer</translation>
     </message>
     <message>
-        <location filename="../3rdparty/kdiff3/difftextwindow.cpp" line="384"/>
+        <location filename="../3rdparty/kdiff3/difftextwindow.cpp" line="389"/>
         <source>Line</source>
         <translation>Línia
 </translation>
     </message>
     <message>
-        <location filename="../3rdparty/kdiff3/difftextwindow.cpp" line="386"/>
+        <location filename="../3rdparty/kdiff3/difftextwindow.cpp" line="391"/>
         <source>Line not available</source>
         <translation>Línia no disponible</translation>
     </message>
 </context>
 <context>
     <name>DiffTextWindowFrame</name>
     <message>
-        <location filename="../3rdparty/kdiff3/difftextwindow.cpp" line="1794"/>
-        <location filename="../3rdparty/kdiff3/difftextwindow.cpp" line="1977"/>
+        <location filename="../3rdparty/kdiff3/difftextwindow.cpp" line="1799"/>
+        <location filename="../3rdparty/kdiff3/difftextwindow.cpp" line="1982"/>
         <source>Open file...</source>
         <translation>Obre fitxer...</translation>
     </message>
     <message>
-        <location filename="../3rdparty/kdiff3/difftextwindow.cpp" line="1888"/>
+        <location filename="../3rdparty/kdiff3/difftextwindow.cpp" line="1893"/>
         <source>Top line</source>
         <translation>Línia superior</translation>
     </message>
     <message>
-        <location filename="../3rdparty/kdiff3/difftextwindow.cpp" line="1898"/>
+        <location filename="../3rdparty/kdiff3/difftextwindow.cpp" line="1903"/>
         <source>End</source>
         <translation>Final</translation>
     </message>
 </context>
 <context>
     <name>FileAccessJobHandler</name>
     <message>
-        <location filename="../3rdparty/kdiff3/fileaccess.cpp" line="1390"/>
+        <location filename="../3rdparty/kdiff3/fileaccess.cpp" line="1389"/>
         <source>Reading directory: </source>
         <translation>Llegint el directori: </translation>
     </message>
 </context>
 <context>
     <name>KDiff3App</name>
     <message>
-        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="965"/>
+        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="972"/>
         <source>Opening of these files failed:</source>
         <translation>Ha fallat l&apos;obertura d&apos;aquest fitxers:</translation>
     </message>
     <message>
-        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="260"/>
+        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="266"/>
         <source>Loading A</source>
         <translation>Carregant A</translation>
     </message>
     <message>
-        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="264"/>
+        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="270"/>
         <source>Loading B</source>
         <translation>Carregant B</translation>
     </message>
     <message>
-        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="275"/>
+        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="281"/>
         <source>Diff: A &lt;-&gt; B</source>
         <translation>Dif.: A &lt;-&gt; B</translation>
     </message>
     <message>
-        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="282"/>
+        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="288"/>
         <source>Linediff: A &lt;-&gt; B</source>
         <translation>Dif. línia: A &lt;-&gt; B</translation>
     </message>
     <message>
-        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="342"/>
+        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="348"/>
         <source>All input files are binary equal.</source>
         <translation>Tots els fitxers d&apos;entrada son iguals a nivel binari.</translation>
     </message>
     <message>
-        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="344"/>
+        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="350"/>
         <source>All input files contain the same text, but are not binary equal.</source>
         <translation>Tots els fitxers d&apos;entrada contenen el mateix text, però són diferents a nivell binari.</translation>
     </message>
     <message>
-        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="347"/>
-        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="354"/>
-        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="361"/>
+        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="353"/>
+        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="360"/>
+        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="367"/>
         <source>Files %1 and %2 are binary equal.
 </source>
         <translation>Els fitxers %1 i %2 són iguals a nivell binari.
 </translation>
     </message>
     <message>
-        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="349"/>
-        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="356"/>
-        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="363"/>
+        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="355"/>
+        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="362"/>
+        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="369"/>
         <source>Files %1 and %2 have equal text, but are not binary equal. 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="374"/>
+        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="380"/>
         <source>Diff</source>
         <translation>Dif</translation>
     </message>
     <message>
-        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="374"/>
+        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="380"/>
         <source>Some inputfiles don&apos;t seem to be pure textfiles.
 Note that the KDiff3-merge was not meant for binary data.
 Continue at your own risk.</source>
@@ -116,75 +116,75 @@ Tingueu en compte que el fusionat de KDiff3 no està pensat per a dades binàrie
 Continueu sota la vostra responsabilitat.</translation>
     </message>
     <message>
-        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="493"/>
+        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="499"/>
         <source>&amp;Copy</source>
         <translation type="unfinished">&amp;Copia</translation>
     </message>
     <message>
-        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="495"/>
+        <location filename="../3rdparty/kdiff3/pdiff.cpp" line="501"/>
         <source>Copy the current selection&apos;s contents to the clipboard</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MergeResultWindow</name>
     <message>
-        <location filename="../3rdparty/kdiff3/mergeresultwindow.cpp" line="1794"/>
+        <location filename="../3rdparty/kdiff3/mergeresultwindow.cpp" line="1795"/>
         <source>&lt;No src line&gt;</source>
         <translation>&lt;No hi ha línia src&gt;</translation>
     </message>
     <message>
-        <location filename="../3rdparty/kdiff3/mergeresultwindow.cpp" line="1804"/>
+        <location filename="../3rdparty/kdiff3/mergeresultwindow.cpp" line="1805"/>
         <source>&lt;Merge Conflict (Whitespace only)&gt;</source>
         <translation>&lt;Cnoflicte de fusionat (Només espais en blanc)&gt;</translation>
     </message>
     <message>
-        <location filename="../3rdparty/kdiff3/mergeresultwindow.cpp" line="1806"/>
-        <location filename="../3rdparty/kdiff3/mergeresultwindow.cpp" line="2717"/>
+        <location filename="../3rdparty/kdiff3/mergeresultwindow.cpp" line="1807"/>
+        <location filename="../3rdparty/kdiff3/mergeresultwindow.cpp" line="2723"/>
         <source>&lt;Merge Conflict&gt;</source>
         <translation>&lt;Cnoflicte de fusionat&gt;</translation>
     </message>
 </context>
 <context>
     <name>OptionEncodingComboBox</name>
     <message>
-        <location filename="../3rdparty/kdiff3/optiondialog.cpp" line="528"/>
+        <location filename="../3rdparty/kdiff3/optiondialog.cpp" line="531"/>
         <source>Unicode, 8 bit</source>
         <translation>Unicode de 8 bits</translation>
     </message>
     <message>
-        <location filename="../3rdparty/kdiff3/optiondialog.cpp" line="529"/>
+        <location filename="../3rdparty/kdiff3/optiondialog.cpp" line="532"/>
         <source>Unicode</source>
         <translation>Unicode</translation>
     </message>
     <message>
-        <location filename="../3rdparty/kdiff3/optiondialog.cpp" line="530"/>
+        <location filename="../3rdparty/kdiff3/optiondialog.cpp" line="533"/>
         <source>Latin1</source>
         <translation>Latin1</translation>
     </message>
     <message>
-        <location filename="../3rdparty/kdiff3/optiondialog.cpp" line="550"/>
+        <location filename="../3rdparty/kdiff3/optiondialog.cpp" line="553"/>
         <source>Change this if non-ASCII characters are not displayed correctly.</source>
         <translation>Canvieu-ho si els caràcters no ASCIi no es mostres correctament.</translation>
     </message>
 </context>
 <context>
     <name>ProgressDialog</name>
     <message>
-        <location filename="../3rdparty/kdiff3/fileaccess.cpp" line="1656"/>
+        <location filename="../3rdparty/kdiff3/fileaccess.cpp" line="1655"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Canceŀla</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../3rdparty/kdiff3/common.cpp" line="212"/>
+        <location filename="../3rdparty/kdiff3/common.cpp" line="210"/>
         <source>CNC programs files (</source>
         <translation>Fitxer de programes CNC (</translation>
     </message>
     <message>
-        <location filename="../3rdparty/kdiff3/common.cpp" line="218"/>
+        <location filename="../3rdparty/kdiff3/common.cpp" line="216"/>
         <source>);;Text files (*.txt);; All files (*.* *)</source>
         <translation>);;Fitxers de text (*.txt);; Tots els fitxers (*.* *)</translation>
     </message>
@@ -200,30 +200,30 @@ Continueu sota la vostra responsabilitat.</translation>
 <context>
     <name>WindowTitleWidget</name>
     <message>
-        <location filename="../3rdparty/kdiff3/mergeresultwindow.cpp" line="3330"/>
+        <location filename="../3rdparty/kdiff3/mergeresultwindow.cpp" line="3336"/>
         <source>Output</source>
         <translation>Sortida</translation>
     </message>
     <message>
-        <location filename="../3rdparty/kdiff3/mergeresultwindow.cpp" line="3342"/>
-        <location filename="../3rdparty/kdiff3/mergeresultwindow.cpp" line="3539"/>
+        <location filename="../3rdparty/kdiff3/mergeresultwindow.cpp" line="3348"/>
+        <location filename="../3rdparty/kdiff3/mergeresultwindow.cpp" line="3545"/>
         <source>[Modified]</source>
         <translation>[Modificat]</translation>
     </message>
     <message>
-        <location filename="../3rdparty/kdiff3/mergeresultwindow.cpp" line="3349"/>
+        <location filename="../3rdparty/kdiff3/mergeresultwindow.cpp" line="3355"/>
         <source>Encoding for saving</source>
         <translation>Codificanr per a desar</translation>
     </message>
     <message>
-        <location filename="../3rdparty/kdiff3/mergeresultwindow.cpp" line="3357"/>
+        <location filename="../3rdparty/kdiff3/mergeresultwindow.cpp" line="3363"/>
         <source>Line end style:</source>
         <translation>Tipus de final de línia:</translation>
     </message>
     <message>
-        <location filename="../3rdparty/kdiff3/mergeresultwindow.cpp" line="3474"/>
-        <location filename="../3rdparty/kdiff3/mergeresultwindow.cpp" line="3479"/>
-        <location filename="../3rdparty/kdiff3/mergeresultwindow.cpp" line="3484"/>
+        <location filename="../3rdparty/kdiff3/mergeresultwindow.cpp" line="3480"/>
+        <location filename="../3rdparty/kdiff3/mergeresultwindow.cpp" line="3485"/>
+        <location filename="../3rdparty/kdiff3/mergeresultwindow.cpp" line="3490"/>
         <source>Codec from</source>
         <translation>Codec de</translation>
     </message>