Commit b0742976 authored by Script Kiddy's avatar Script Kiddy

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"
parent 06ab0e67
[KNewStuff3] [KNewStuff3]
Name=Login Screen Name=Login Screen
Name[ca]=Pantalla d'inici de sessió
Name[uk]=Вікно входу
Name[x-test]=xxLogin Screenxx
ProvidersUrl= ProvidersUrl=
Categories=SDDM Theme Categories=SDDM Theme
StandardResource=tmp StandardResource=tmp
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment