Commit 0dd53cd3 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 fb1c11d1
Pipeline #5242 passed with stage
in 8 minutes and 25 seconds
......@@ -2,6 +2,7 @@
Name=Calindori
Name[ca]=Calindori
Name[es]=Calindori
Name[gl]=Calindori
Name[it]=Calindori
Name[nl]=Calindori
Name[pt]=Calindori
......@@ -11,6 +12,7 @@ Name[x-test]=xxCalindorixx
Comment=Calindori
Comment[ca]=Calindori
Comment[es]=Calindori
Comment[gl]=Calindori
Comment[it]=Calindori
Comment[nl]=Calindori
Comment[pt]=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