Commit 0203c5cb 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 6a3c3652
......@@ -113,6 +113,7 @@ Comment[ca@valencia]=Connecteu els punts per crear quadrats
Comment[en_GB]=Connect the dots to create squares
Comment[es]=Conecta los puntos para crear cuadrados
Comment[nl]=Verbind de stippen om vierkanten te maken
Comment[pl]=Połącz kropki, żeby otrzymać kwadraty
Comment[pt]=Ligue os pontos para criar quadrados
Comment[ru]=Соединяйте точки для создания квадрата
Comment[sk]=Spojte bodky a vytvorte štvorce
Supports Markdown
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