kdeconnect-kde/plasmoid
l10n daemon script e213eb509c 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"
2021-08-09 01:10:05 +00:00
..
package SVN_SILENT made messages (.desktop file) - always resolve ours 2021-08-09 01:10:05 +00:00
CMakeLists.txt Use KPackage macro for installing plasmoid 2021-07-29 16:00:29 +02:00
Messages.sh Don’t extract QML strings as Java printf strings 2021-04-06 21:09:48 +02:00