Commit 092326d2 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 13f7a7ce
......@@ -35,6 +35,7 @@ GenericName[ast]=Xuegu educativu
GenericName[ca]=Joc educatiu
GenericName[ca@valencia]=Joc educatiu
GenericName[cs]=Výuková hra
GenericName[da]=Læringsspil
GenericName[de]=Lernspiel
GenericName[el]=Εκπαιδευτικό παιχνίδι
GenericName[en_GB]=Educational game
......
......@@ -35,6 +35,7 @@ GenericName[ast]=Xuegu educativu
GenericName[ca]=Joc educatiu
GenericName[ca@valencia]=Joc educatiu
GenericName[cs]=Výuková hra
GenericName[da]=Læringsspil
GenericName[de]=Lernspiel
GenericName[el]=Εκπαιδευτικό παιχνίδι
GenericName[en_GB]=Educational game
......
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