Commit 243e54c3 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 c79c7ef5
......@@ -115,6 +115,7 @@ Comment[da]=Forbind prikkerne for at danne kvadrater
Comment[de]=Käsekästchen-Spiel
Comment[en_GB]=Connect the dots to create squares
Comment[es]=Conecta los puntos para crear cuadrados
Comment[fi]=Yhdistä pisteet muodostaaksesi neliöitä
Comment[fr]=Relier les points pour créer des carrés
Comment[gl]=Conecta os puntos creando cadrados
Comment[it]=Unisci i puntini per creare dei quadrati
......
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