Commit d7430e0e 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 fcf08200
Pipeline #6959 passed with stage
in 6 minutes and 57 seconds
......@@ -15,6 +15,7 @@ Comment[uk]=Календар для мобільної Плазми
Comment[x-test]=xxPlasma Mobile Calendarxx
Name=Calindori
Name[ca]=Calindori
Name[cs]=Calindori
Name[de]=Calindori
Name[es]=Calindori
Name[fr]=Calindori
......@@ -58,6 +59,7 @@ Comment[x-test]=xxThe uid of the incidence of the alarmxx
[Event/alarm]
Name=Alarm
Name[ca]=Alarma
Name[cs]=Alarm
Name[de]=Erinnerung
Name[es]=Alarma
Name[fr]=Alarme
......
[Desktop Entry]
Name=Calindori
Name[ca]=Calindori
Name[cs]=Calindori
Name[de]=Calindori
Name[es]=Calindori
Name[fr]=Calindori
......@@ -14,6 +15,7 @@ Name[uk]=Calindori
Name[x-test]=xxCalindorixx
Comment=Calindori
Comment[ca]=Calindori
Comment[cs]=Calindori
Comment[de]=Calindori
Comment[es]=Calindori
Comment[fr]=Calindori
......
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