Commit c0dbd848 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 8784cf60
......@@ -190,7 +190,7 @@ Name[sr@ijekavianlatin]=Digitalni fotoaparat
Name[sr@latin]=Digitalni fotoaparat
Name[ta]= Digital Camera
Name[tg]=Камераи digital
Name[tg]=Камераи рақамӣ
Name[tr]=Dijital Kamera
Name[ug]=رەقەملىك كامېرا
Supports Markdown
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