Commit 3fd8ddcc 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 9d160fc6
......@@ -32,6 +32,7 @@ GenericName=Educational Game for Children
GenericName[ca]=Joc educatiu per a infants
GenericName[ca@valencia]=Joc educatiu per a infants
GenericName[cs]=Výuková hra pro děti
GenericName[de]=Lernspiel für Kinder
GenericName[el]=Εκπαιδευτικό παιχνίδι για παιδιά
GenericName[en_GB]=Educational Game for Children
GenericName[es]=Juego educativo para niños
......
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