aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/desktop-utils
diff options
context:
space:
mode:
authorJosh <joshms@trueos.org>2017-07-24 10:44:00 -0400
committerGitHub <noreply@github.com>2017-07-24 10:44:00 -0400
commitf4f2f7408110b01b2abd32d5dc7d1bc2e1b1e67f (patch)
tree6db400b4307d6fd79d910c33e776c2ad7e0490d9 /src-qt5/desktop-utils
parentMerge remote-tracking branch 'origin/master' (diff)
downloadlumina-f4f2f7408110b01b2abd32d5dc7d1bc2e1b1e67f.tar.gz
lumina-f4f2f7408110b01b2abd32d5dc7d1bc2e1b1e67f.tar.bz2
lumina-f4f2f7408110b01b2abd32d5dc7d1bc2e1b1e67f.zip
Remove commit message from the translation file
There was a commit message in there. Oops!
Diffstat (limited to 'src-qt5/desktop-utils')
-rw-r--r--src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_cs.ts4
1 files changed, 0 insertions, 4 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..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>
bgstack15