Commit 80671e81 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 55faac5a
......@@ -79,7 +79,7 @@ Comment[it]=Lettore video integrabile
Comment[ja]=埋め込み可能な動画プレーヤー
Comment[kk]=Ендірілетін бейне ойнатқышы
Comment[km]=កម្មវិធី​ចាក់​វីដេអូ​ដែល​អាច​បង្កប់បាន
Comment[ko]=끼워넣을 수 있는 동영상 재생기
Comment[ko]=임베드 가능 동영상 재생기
Comment[lt]=Įdedamas video grotuvas
Comment[mr]=अंतर्भूत करण्यायोग्य व्हिडीओ प्लेयर
Comment[nb]=Innebyggbar filmspiller
......
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