Commit b4dc2dd6 authored by Script Kiddy's avatar Script Kiddy

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 1fc8594e
......@@ -5,6 +5,7 @@ Name[ca@valencia]=Acoblador d'animació
Name[en_GB]=Animation Docker
Name[es]=Panel de animación
Name[it]=Area di aggancio delle animazioni
Name[pl]=Dokowanie animacji
Name[pt]=Área de Animação
......@@ -19,6 +20,7 @@ Comment[ca@valencia]=Acoblador per animar
Comment[en_GB]=Docker for animating
Comment[es]=Panel para animar
Comment[it]=Area di aggancio per l'animazione
Comment[nl]=Vastzetten voor animatie
Comment[pl]=Dokowanie dla animacji
Comment[pt]=Acoplador para execução de animações
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