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 f35210a3 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 e28d1089
......@@ -93,8 +93,8 @@ Name[zh_CN]=KHelpCenter
Comment=Help for applications
Comment[ast]=Ayuda de les aplicaciones
Comment[ca]=Ajuda per les aplicacions
Comment[ca@valencia]=Ajuda per les aplicacions
Comment[ca]=Ajuda per a les aplicacions
Comment[ca@valencia]=Ajuda per a les aplicacions
Comment[cs]=Nápověda pro aplikace
Comment[da]=Hjælp til programmer
Comment[de]=Handbücher für Anwendungen
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