Commit afd635f3 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 98d2f58f
Pipeline #6142 passed with stage
in 6 minutes and 7 seconds
......@@ -2,11 +2,22 @@
IconName=kalarm
Comment=Plasma Mobile Calendar
Name=Calindori
Name[ca]=Calindori
Name[es]=Calindori
Name[fr]=Calindori
Name[gl]=Calindori
Name[it]=Calindori
Name[nl]=Calindori
Name[pl]=Calindori
Name[pt]=Calindori
Name[sv]=Calindori
Name[uk]=Calindori
Name[x-test]=xxCalindorixx
[Context/uid]
Name=Incidence uid
Comment=The uid of the incidence of the alarm
[Event/alarm]
Name=Alarm
Contexts=uid
......
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