l10n daemon script 02bf543919 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"		2020-10-29 06:36:15 +01:00
..
hellopython	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-10-29 06:36:15 +01:00
helloqml	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-10-29 06:36:15 +01:00
middleclickloader	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-10-29 06:36:15 +01:00
runaction	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-10-29 06:36:15 +01:00
CMakeLists.txt	Plugins: Use embedded JSON metadata for shared library plugins	2019-04-21 11:03:26 +02:00
i18n.py	Support loading translations for Python extensions	2018-02-27 12:18:26 +01:00