Commit 3b7eaaff 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 d685eeb4
......@@ -121,6 +121,7 @@ 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
Comment[pt]=Ligue os pontos para criar quadrados
Comment[pt_BR]=Conecte os pontos para criar quadrados
Comment[ru]=Соединяйте точки для создания квадрата
Comment[sk]=Spojte bodky a vytvorte štvorce
Comment[sl]=Povežite pikice, da ustvarite kvadrate
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