Commit 3c04ad9e 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 f2ee41fc
......@@ -118,6 +118,7 @@ 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
Comment[ko]=점을 연결해서 사각형 만들기
Comment[nl]=Verbind de stippen om vierkanten te maken
Comment[nn]=Teikn strekar mellom prikkar for å laga kvadrat
Comment[pl]=Połącz kropki, żeby otrzymać kwadraty
......
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