Commit 7ffd41a9 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 35122618
......@@ -94,7 +94,7 @@ GenericName[it]=Gioco di immagini per bambini
GenericName[ja]=子供のための福笑いゲーム
GenericName[kk]=Сурет салу балалар ойны
GenericName[km]=ល្បែង​រូបភាព​សម្រាប់​ក្មេងៗ
GenericName[ko]=어린이를 위한 그림 게임
GenericName[ko]=어린이 그림 게임
GenericName[lv]=Bilžu spēle bērniem
GenericName[mr]=मुलांकरिता प्रतिमा खेळ
GenericName[nb]=Bildespill for unger
......
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