l10n daemon script d61b117959 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"		2018-03-01 05:29:40 +01:00
..
lib	Merge branch 'Falkon/3.0'	2018-02-28 17:00:08 +00:00
main	Extract and install Python translations	2018-02-27 11:32:29 +01:00
plugins	PluginInterface: Remove getTranslator	2018-02-27 11:31:34 +01:00
scripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-03-01 05:29:40 +01:00
CMakeLists.txt	Add example hellopython Python extension	2018-02-26 18:18:56 +01:00
Messages.sh	gettext translations: extract them and use ECM to load them	2018-02-25 00:27:41 +01:00