Commit cd928c16 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 a32f95f4
......@@ -2,6 +2,7 @@
Name=Animation Docker
Name[ca]=Acoblador d'animació
Name[en_GB]=Animation Docker
Name[es]=Panel de animación
Name[fi]=Animointitelakka
Name[nl]=Animatievastzetter
Name[pl]=Dokowanie animacji
......@@ -14,6 +15,7 @@ Name[x-test]=xxAnimation Dockerxx
Comment=Docker for animating
Comment[ca]=Acoblador per animar
Comment[en_GB]=Docker for animating
Comment[es]=Panel para animar
Comment[fi]=Animointitelakka
Comment[nl]=Vastzetten voor animatie
Comment[pl]=Dokowanie dla animacji
......
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