Commit ef0a1986 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 7067cafe
......@@ -74,7 +74,7 @@ GenericName[fa]=اتصال نقطه‌ها برای ایجاد مربعها
GenericName[fi]=Yhdistä pisteet muodostaaksesi neliöitä
GenericName[fr]=Relier les points pour créer des carrés
GenericName[ga]=Ceangail na poncanna chun cearnóga a chruthú
GenericName[gl]=Conecta os puntos formando cadrados
GenericName[gl]=Conecta os puntos creando cadrados
GenericName[hne]=वर्ग बनाए बर बिंदु मन ल जोड़व
GenericName[hu]=Négyzetet kell rajzolni a pontokkal
GenericName[it]=Unisci i puntini per creare dei quadrati
......@@ -116,7 +116,7 @@ Comment[de]=Käsekästchen-Spiel
Comment[en_GB]=Connect the dots to create squares
Comment[es]=Conecta los puntos para crear cuadrados
Comment[fr]=Relier les points pour créer des carrés
Comment[gl]=Conecta os puntos formando cadrados
Comment[gl]=Conecta os puntos creando cadrados
Comment[it]=Unisci i puntini per creare dei quadrati
Comment[nl]=Verbind de stippen om vierkanten te maken
Comment[nn]=Teikn strekar mellom prikkar for å laga kvadrat
......
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