Commit 5b7164e7 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 2852b192
...@@ -33,6 +33,7 @@ GenericName[ca]=Joc educatiu per a infants ...@@ -33,6 +33,7 @@ GenericName[ca]=Joc educatiu per a infants
GenericName[ca@valencia]=Joc educatiu per a infants GenericName[ca@valencia]=Joc educatiu per a infants
GenericName[cs]=Výuková hra pro děti GenericName[cs]=Výuková hra pro děti
GenericName[el]=Εκπαιδευτικό παιχνίδι για παιδιά GenericName[el]=Εκπαιδευτικό παιχνίδι για παιδιά
GenericName[en_GB]=Educational Game for Children
GenericName[es]=Juego educativo para niños GenericName[es]=Juego educativo para niños
GenericName[et]=Hariv mäng lastele GenericName[et]=Hariv mäng lastele
GenericName[fr]=Jeu éducatif pour les enfants GenericName[fr]=Jeu éducatif pour les enfants
......
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