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"
master
l10n daemon script 3 years ago
parent 0054d825c4
commit 216233c2ec

@ -18,6 +18,7 @@ Name[fr]=aperçu
Name[it]=panoramica
Name[lt]=apžvalga
Name[nl]=overzicht
Name[pl]=przegląd
Name[pt]=introdução
Name[sl]=pregled
Name[sv]=översikt

Loading…
Cancel
Save