Commit 61d363f5 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 506b7449
...@@ -34,6 +34,7 @@ Name[hu]=Krita ...@@ -34,6 +34,7 @@ Name[hu]=Krita
Name[ia]=Krita Name[ia]=Krita
Name[is]=Krita Name[is]=Krita
Name[it]=Krita Name[it]=Krita
Name[ja]=Krita
Name[kk]=Krita Name[kk]=Krita
Name[ko]=Krita Name[ko]=Krita
Name[lt]=Krita Name[lt]=Krita
......
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