Commit 78274a7a 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 1f52a6d2
......@@ -32,7 +32,7 @@ GenericName[ja]=タイマー
GenericName[kk]=Кері санақ
GenericName[km]=កម្មវិធី​ចាប់ផ្ដើម​កា​ររាប់​ថយក្រោយ
GenericName[ko]=카운트다운 실행기
GenericName[lt]=Laiko skaičiuoklė
GenericName[lt]=Atvirkštinis laikmatis
GenericName[lv]=Laika atskaites palaidējs
GenericName[mr]=काउंटडाउन प्रक्षेपक
GenericName[nb]=Nedtellingstarter
......
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