Commit 6eb9cbf6 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 3f691010
......@@ -167,7 +167,7 @@ Name[he]=צילום כל שולחן עבודה
Name[ia]=Captura le scriptorio integre
Name[id]=Tangkap Seluruh Desktop
Name[it]=Cattura l'intero desktop
Name[ko]=전체 데스크톱 찍기
Name[ko]=전체 바탕 화면 찍기
Name[lt]=Fotografuoti visą darbalaukį
Name[nl]=Gehele bureaublad vangen
Name[nn]=Ta bilete av heile skrivebordet
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