diff options
author | Weblate <noreply@weblate.org> | 2017-07-27 16:18:54 +0000 |
---|---|---|
committer | Weblate <noreply@weblate.org> | 2017-07-27 16:18:54 +0000 |
commit | 0254535afb27830d8be14f25a2c79967a107a158 (patch) | |
tree | ad2e2f76f6c34fe34b311e8e0311d4636a2c2e0c /src-qt5/desktop-utils/lumina-fm | |
parent | Translated using Weblate (Czech) (diff) | |
parent | Merge branch 'master' of https://github.com/trueos/lumina (diff) | |
download | lumina-0254535afb27830d8be14f25a2c79967a107a158.tar.gz lumina-0254535afb27830d8be14f25a2c79967a107a158.tar.bz2 lumina-0254535afb27830d8be14f25a2c79967a107a158.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src-qt5/desktop-utils/lumina-fm')
-rw-r--r-- | src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_cs.ts | 4 |
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> |