Merge remote-tracking branch 'origin/master'

2 files changed, 8 insertions, 12 deletions

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..3adbf86b 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
@@ -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>Nástroj &quot;lumina-fileinfo&quot; nebyl nalezen.Prosím nainstalujte ho první.</translation>
+        <source>The "lumina-fileinfo" utility could not be found on the system. Please install it first.</source>
+        <translation>Nástroj "lumina-fileinfo" nebyl nalezen.Prosím nainstalujte ho první.</translation>
     </message>
     <message>
         <location filename="../widgets/DirWidget2.cpp" line="562"/>
@@ -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>
@@ -874,7 +870,7 @@ Nové umístění: %2</translation>
     <message>
         <location filename="../MainUI.cpp" line="238"/>
         <source>CTRL+E</source>
-        <translation>Ctrl+E</translation>
+        <translation>CTRL+E</translation>
     </message>
     <message>
         <location filename="../MainUI.cpp" line="356"/>
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"/>