Commit 2c4e3598 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 a43d7e07
......@@ -48,6 +48,7 @@ GenericName[sl]=Izobraževalna igra za otroke
GenericName[sv]=Pedagogiskt spel för barn
GenericName[uk]=Освітня гра для дітей
GenericName[x-test]=xxEducational Game for Childrenxx
GenericName[zh_CN]=儿童教育游戏
Comment=Multi-Activity Educational game for children 2 to 10
Comment[ar]=لعبة تعليميّة متعدّدة الأنشطة للأطفال من سنتين إلى ١٠ سنوات
Comment[br]=C'hoari kelennadel gant oberezhioù a bep seurt evit ar vugale etre 2 ha 10 vloaz
......
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