Commit 9d160fc6 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 29c25f12
......@@ -41,6 +41,7 @@ GenericName[it]=Gioco didattico per bambini
GenericName[nl]=Educatief spel voor kinderen
GenericName[pt]=Jogo Educativo para Crianças
GenericName[pt_BR]=Jogo educacional para crianças
GenericName[sl]=Izobraževalna igra za otroke
GenericName[sv]=Pedagogiskt spel för barn
GenericName[uk]=Освітня гра для дітей
GenericName[x-test]=xxEducational Game for Childrenxx
......
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