l10n daemon script caf1380774 SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"		2019-01-21 05:18:24 +01:00
..
CMakeLists.txt	gettext translations: extract them and use ECM to load them	2018-02-25 00:27:41 +01:00
Messages.sh	gettext translations: extract them and use ECM to load them	2018-02-25 00:27:41 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-21 05:18:24 +01:00
testplugin_sidebar.cpp	Use Falkon icons in about dialog and internal pages	2018-02-24 09:21:13 +01:00
testplugin_sidebar.h	Initial rename to Falkon	2017-08-25 17:32:32 +02:00
testplugin.cpp	PluginInterface: Remove getTranslator	2018-02-27 11:31:34 +01:00
testplugin.h	PluginInterface: Remove getTranslator	2018-02-27 11:31:34 +01:00
testplugin.qrc	Plugins: Port plugin spec to standard desktop file	2018-02-11 14:38:01 +01:00