Commit b4801200 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 275dddd5
......@@ -14,7 +14,7 @@ Name[et]=KReversi vaiketeema
Name[fi]=KReversi-pelin oletusteema
Name[fr]=Thème par défaut pour KReversi
Name[ga]=Téama Réamhshocraithe KReversi
Name[gl]=Tema visual por omisión do KReversi
Name[gl]=Tema visual predeterminado do KReversi
Name[hu]=Alapértelmezett KReversi-téma
Name[it]=Tema predefinito per KReversi
Name[kk]=KReversi әдетті нақышы
......
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