Commit 9d80a56e 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 964eca5c
...@@ -135,6 +135,7 @@ Comment[de]=Bälle einfangen ...@@ -135,6 +135,7 @@ Comment[de]=Bälle einfangen
Comment[el]=Παιχνίδι αναπήδησης μπάλας Comment[el]=Παιχνίδι αναπήδησης μπάλας
Comment[en_GB]=Ball Bouncing Game Comment[en_GB]=Ball Bouncing Game
Comment[es]=Juego de pelotas que rebotan Comment[es]=Juego de pelotas que rebotan
Comment[et]=Pallipõrgatamise mäng
Comment[fi]=Pallonpomputuspeli Comment[fi]=Pallonpomputuspeli
Comment[fr]=Jeu de balles rebondissantes Comment[fr]=Jeu de balles rebondissantes
Comment[gl]=Xogo de bólas que botan Comment[gl]=Xogo de bólas que botan
......
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