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"
pull/2/head
l10n daemon script 7 years ago
parent a01b7f100b
commit c4a8881da1

@ -2,6 +2,7 @@
Name=Latte Layouts
Name[ca]=Disposicions del Latte
Name[ca@valencia]=Disposicions del Latte
Name[de]=Latte-Profile
Name[nl]=Latte-indelingen
Name[pl]=Układy Latte
Name[pt]=Disposições do Latte

Loading…
Cancel
Save