Commit dd3ee9f3 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 19416d41
......@@ -45,7 +45,7 @@ Comment[ka]=მინი-გამოსახულების დამმუ
Comment[kk]=Нобай өңдеуші
Comment[kn]=ಸೂಚ್ಯಚಿತ್ರ ನಿಭಾರಕ
Comment[ko]=미리 보기 처리기
Comment[ko]=축소판 처리기
Comment[ku]=Karkerê Serpêçiyê
Comment[lt]=Miniatiūrų doroklė
Comment[lv]=Sīktēlu apstrādātājs
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