l10n daemon script e6a7df25aa 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"		2016-12-20 12:45:03 +01:00
..
declarativeplugin	Clazy says all this QStringLiteral and QLatin1String were missing/wrong	2016-11-26 16:21:29 +01:00
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-20 12:45:03 +01:00
CMakeLists.txt	Streamline internal naming (kdeconnect → org.kde.kdeconnect)	2014-08-26 01:37:35 +02:00
Messages.sh	i18n fixes	2014-09-08 03:09:18 +02:00