Commit 2465c5bc 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 0370aee7
......@@ -39,7 +39,7 @@ Name[hu]=Betűtípusfájlok
Name[ia]=Files de font
Name[id]=Berkas Fonta
Name[it]=File dei carattere
Name[it]=File dei caratteri
Name[ka]=ფონტების ფაილები
Name[kk]=Қаріп файлдары
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