Commit 79061a1d 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 231c155e
......@@ -29,6 +29,7 @@ Name[km]=ឯកសារ Mobipocket
Name[ko]=Mobipocket 파일
Name[lt]=Mobipocket failai
Name[lv]=Mobipocket faili
Name[ml]=മൊബി പോക്കറ്റ്‌ ഫയലുകൾ
Name[mr]=मोबीपॉकेट फाईल्स
Name[nb]=Mobipocket-filer
Name[nds]=Mobipocket-Dateien
......
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