Commit 6c03ba1f 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 365c55e5
Pipeline #5629 passed with stage
in 5 minutes and 10 seconds
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
Name=Calindori Name=Calindori
Name[ca]=Calindori Name[ca]=Calindori
Name[es]=Calindori Name[es]=Calindori
Name[fr]=Calindori
Name[gl]=Calindori Name[gl]=Calindori
Name[it]=Calindori Name[it]=Calindori
Name[nl]=Calindori Name[nl]=Calindori
...@@ -12,6 +13,7 @@ Name[x-test]=xxCalindorixx ...@@ -12,6 +13,7 @@ Name[x-test]=xxCalindorixx
Comment=Calindori Comment=Calindori
Comment[ca]=Calindori Comment[ca]=Calindori
Comment[es]=Calindori Comment[es]=Calindori
Comment[fr]=Calindori
Comment[gl]=Calindori Comment[gl]=Calindori
Comment[it]=Calindori Comment[it]=Calindori
Comment[nl]=Calindori Comment[nl]=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