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/5/head
l10n daemon script 6 years ago
parent 555fc966b0
commit 73745f2f53

@ -105,10 +105,18 @@ Action=Popup
[Event/remove-done]
Name=Removed successfully
Name[ca]=S'ha eliminat amb èxit
Name[nl]=Met succes verwijderd
Name[uk]=Успішно вилучено
Name[x-test]=xxRemoved successfullyxx
Action=Popup
[Event/remove-fail]
Name=Failed to remove
Name[ca]=Ha fallat en eliminar
Name[nl]=Verwijderen is mislukt
Name[uk]=Не вдалося вилучити
Name[x-test]=xxFailed to removexx
Action=Popup
[Event/switch-layout]

Loading…
Cancel
Save