Commit fe7b3d46 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 75633aca
......@@ -44,6 +44,7 @@ GenericName[nn]=Pedagogisk musikkprogram
GenericName[pl]=Muzyczne oprogramowanie edukacyjne
GenericName[pt]=Aplicação de Educação Musical
GenericName[pt_BR]=Software para Ensino de Música
GenericName[ru]=Программа для обучения музыке
GenericName[sk]=Hudobný výukový softvér
GenericName[sv]=Programvara för musikutbildning
GenericName[tr]=Müzik Eğitim Yazılımı
......
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