Members of the KDE Community are recommended to subscribe to the kde-community mailing list at to allow them to participate in important discussions and receive other important announcements

Commit f985d719 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 d7376097
......@@ -107,6 +107,7 @@ Comment=Application Color Scheme
Comment[ca]=Esquema de color de les aplicacions
Comment[ca@valencia]=Esquema de color de les aplicacions
Comment[cs]=Barevný motiv aplikací
Comment[da]=Farvetema til program
Comment[de]=Farbschema für Anwendungen
Comment[el]=Θέμα χρωμάτων εφαρμογής
Comment[en_GB]=Application Colour Scheme
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