Commit a20e9766 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 503ff22f
Pipeline #29689 skipped
......@@ -2,8 +2,8 @@
IconName=calindori
DesktopEntry=org.kde.calindori
Comment=Plasma Mobile Calendar
Comment[ca]=Calendari del Plasma Mòbil
Comment[ca@valencia]=Calendari del Plasma Mòbil
Comment[ca]=Calendari del Plasma mòbil
Comment[ca@valencia]=Calendari del Plasma mòbil
Comment[de]=Kalender für Plasma Mobile
Comment[en_GB]=Plasma Mobile Calendar
Comment[es]=Calendario de Plasma Mobile
......
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