Merge remote-tracking branch 'origin/master'

3 files changed, 12 insertions, 16 deletions

diff --git a/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_ca.ts b/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_ca.ts
index 8d9a0462..7053564c 100644
--- a/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_ca.ts
+++ b/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_ca.ts
@@ -235,7 +235,7 @@
     <message>
         <location filename="../widgets/DirWidget2.cpp" line="573"/>
         <source>Auto-Extract</source>
-        <translation type="unfinished"></translation>
+        <translation>Extreu automàticament</translation>
     </message>
     <message>
         <location filename="../widgets/DirWidget2.cpp" line="587"/>
@@ -336,8 +336,8 @@
     </message>
     <message>
         <location filename="../widgets/DirWidget2.cpp" line="536"/>
-        <source>The &quot;lumina-fileinfo&quot; utility could not be found on the system. Please install it first.</source>
-        <translation>No s&apos;ha pogut trobar la utilitat &quot;lumina-fileinfo&quot; al sistema. Si us plau, instal·leu-la primer.</translation>
+        <source>The "lumina-fileinfo" utility could not be found on the system. Please install it first.</source>
+        <translation>No s'ha pogut trobar la utilitat "lumina-fileinfo" al sistema. Si us plau, instal·leu-la primer.</translation>
     </message>
     <message>
         <location filename="../widgets/DirWidget2.cpp" line="562"/>
@@ -640,7 +640,7 @@ Localització nova: %2</translation>
     <message>
         <location filename="../MainUI.ui" line="246"/>
         <source>Show Image Previews</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra previsualitzacions d'imatges</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="251"/>
@@ -730,17 +730,17 @@ Localització nova: %2</translation>
     <message>
         <location filename="../MainUI.ui" line="428"/>
         <source>Show Directory Tree Window</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra la finestra de l'arbre de directoris</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="431"/>
         <source>Show Directory Tree Pane</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra el plafó de l'arbre de directoris</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="434"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="178"/>
diff --git a/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_cs.ts b/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_cs.ts
index 153d4962..365d477a 100644
--- a/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_cs.ts
+++ b/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_cs.ts
@@ -783,16 +783,12 @@ Nové umístění: %2</translation>
         <translation>Zobrazit tlačítka akcí</translation>
     </message>
     <message>
-<<<<<<< HEAD
         <location filename="../MainUI.ui" line="245"/>
         <source>Load Thumbnails</source>
         <translation>Načíst náhledy</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="253"/>
-=======
         <location filename="../MainUI.ui" line="254"/>
->>>>>>> 86f6fadf45c2b87749cffac82411d2371448da53
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
diff --git a/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_lt.ts b/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_lt.ts
index 874a041b..d29a466c 100644
--- a/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_lt.ts
+++ b/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_lt.ts
@@ -336,8 +336,8 @@
     </message>
     <message>
         <location filename="../widgets/DirWidget2.cpp" line="536"/>
-        <source>The &quot;lumina-fileinfo&quot; utility could not be found on the system. Please install it first.</source>
-        <translation>Sistemoje nepavyko rasti &quot;lumina-fileinfo&quot; paslaugų programos. Prašome, iš pradžių, ją įdiegti.</translation>
+        <source>The "lumina-fileinfo" utility could not be found on the system. Please install it first.</source>
+        <translation>Sistemoje nepavyko rasti "lumina-fileinfo" paslaugų programos. Prašome, iš pradžių, ją įdiegti.</translation>
     </message>
     <message>
         <location filename="../widgets/DirWidget2.cpp" line="562"/>
@@ -566,8 +566,8 @@ Nauja vieta: %2</translation>
     </message>
     <message>
         <location filename="../gitWizard.ui" line="232"/>
-        <source>Click &quot;Next&quot; to start downloading the repository</source>
-        <translation>Spustelėkite &quot;Kitas&quot;, kad pradėtumėte saugyklos atsisiuntimą</translation>
+        <source>Click "Next" to start downloading the repository</source>
+        <translation>Spustelėkite "Kitas", kad pradėtumėte saugyklos atsisiuntimą</translation>
     </message>
     <message>
         <location filename="../gitWizard.h" line="58"/>
@@ -865,7 +865,7 @@ Nauja vieta: %2</translation>
     <message>
         <location filename="../MainUI.cpp" line="238"/>
         <source>CTRL+E</source>
-        <translation>CTRL(VALD)+E</translation>
+        <translation>CTRL(Vald)+E</translation>
     </message>
     <message>
         <location filename="../MainUI.cpp" line="356"/>