Commit ef365016 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 f41888f9
......@@ -125,7 +125,7 @@ Comment[ja]=次世代デスクトップのスタイル
Comment[kk]=Келесі буын үстел стилі
Comment[kn]=ಮುಂದಿನ ಪೀಳಿಗೆಯ ಗಣಕತೆರೆ ವೈಖರಿ
Comment[ko]=다음 세대 데스크톱을 위한 스타일
Comment[ko]=다음 세대 데스크톱 스타일
Comment[ku]=Curekirina nifşê pêş ê sermaseyê
Comment[lt]=Kitos kartos darbalaukio modeliavimas
Comment[lv]=Nākamās paaudzes darbvirsmas stils
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