Commit 4b39d741 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 fd6b0636
...@@ -116,6 +116,7 @@ Comment[de]=Käsekästchen-Spiel ...@@ -116,6 +116,7 @@ Comment[de]=Käsekästchen-Spiel
Comment[en_GB]=Connect the dots to create squares Comment[en_GB]=Connect the dots to create squares
Comment[es]=Conecta los puntos para crear cuadrados Comment[es]=Conecta los puntos para crear cuadrados
Comment[fr]=Relier les points pour créer des carrés Comment[fr]=Relier les points pour créer des carrés
Comment[gl]=Conecta os puntos formando cadrados
Comment[nl]=Verbind de stippen om vierkanten te maken Comment[nl]=Verbind de stippen om vierkanten te maken
Comment[pl]=Połącz kropki, żeby otrzymać kwadraty Comment[pl]=Połącz kropki, żeby otrzymać kwadraty
Comment[pt]=Ligue os pontos para criar quadrados Comment[pt]=Ligue os pontos para criar quadrados
......
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