l10n daemon script 7689b73daa 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-05-02 07:39:45 +02:00
..
data	Brute crush all pngs	2016-05-12 12:47:46 -06:00
CMakeLists.txt	gettext translations: extract them and use ECM to load them	2018-02-25 00:27:41 +01:00
kwalletpasswordbackend.cpp	Remove compatibility code with Qt older than 5.9	2018-01-14 09:30:15 +01:00
kwalletpasswordbackend.h	Fix building GnomeKeyring and KWallet password backend plugins	2017-09-26 15:19:55 +02:00
kwalletpasswords.qrc	Plugins: Port plugin spec to standard desktop file	2018-02-11 14:38:01 +01:00
kwalletplugin.cpp	PluginInterface: Remove getTranslator	2018-02-27 11:31:34 +01:00
kwalletplugin.h	PluginInterface: Remove getTranslator	2018-02-27 11:31:34 +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	2018-05-02 07:39:45 +02:00