Commit 5714a240 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 18d3a4b3
......@@ -4,6 +4,7 @@ Name[ast]=Minuet
Name[ca]=Minuet
Name[ca@valencia]=Minuet
Name[cs]=Minuet
Name[da]=Minuet
Name[de]=Minuet
Name[en_GB]=Minuet
Name[es]=Minuet
......@@ -26,6 +27,7 @@ GenericName=Music Education Software
GenericName[ast]=Software educativu musical
GenericName[ca]=Programari d'educació musical
GenericName[ca@valencia]=Programari d'educació musical
GenericName[da]=Software til musikundervisning
GenericName[de]=Musik-Lernprogramm
GenericName[en_GB]=Music Education Software
GenericName[es]=Software de aprendizaje musical
......
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