Commit 6e868db7 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 b725b13c
Pipeline #5977 passed with stage
in 6 minutes and 51 seconds
...@@ -6,6 +6,7 @@ Name[fr]=Calindori ...@@ -6,6 +6,7 @@ Name[fr]=Calindori
Name[gl]=Calindori Name[gl]=Calindori
Name[it]=Calindori Name[it]=Calindori
Name[nl]=Calindori Name[nl]=Calindori
Name[pt]=Calindori Name[pt]=Calindori
Name[sv]=Calindori Name[sv]=Calindori
Name[uk]=Calindori Name[uk]=Calindori
...@@ -17,6 +18,7 @@ Comment[fr]=Calindori ...@@ -17,6 +18,7 @@ Comment[fr]=Calindori
Comment[gl]=Calindori Comment[gl]=Calindori
Comment[it]=Calindori Comment[it]=Calindori
Comment[nl]=Calindori Comment[nl]=Calindori
Comment[pt]=Calindori Comment[pt]=Calindori
Comment[sv]=Calindori Comment[sv]=Calindori
Comment[uk]=Calindori Comment[uk]=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