Commit d32266c1 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 4732f56b
......@@ -45,7 +45,6 @@ Name[ia]=Trova files/dossieres
Name[id]=Cari Berkas/Folder
Name[is]=Finna skrár/möppur
Name[it]=Trova file/cartelle
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