Commit fe81b17d 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 00dbfa67
...@@ -581,7 +581,7 @@ Name[he]=מהלך לא חוקי ...@@ -581,7 +581,7 @@ Name[he]=מהלך לא חוקי
Name[hne]=अवैध चाल Name[hne]=अवैध चाल
Name[hr]=Nepravilan potez Name[hr]=Nepravilan potez
Name[hu]=Szabálytalan lépés Name[hu]=Szabálytalan lépés
Name[id]=Langkah Ilegal Name[id]=Gerakan Ilegal
Name[is]=Ógildur leikur Name[is]=Ógildur leikur
Name[it]=Mossa non valida Name[it]=Mossa non valida
Name[ja]=不正な移動 Name[ja]=不正な移動
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