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"
This commit is contained in:
l10n daemon script 2015-05-29 10:01:23 +00:00
parent 397e6f69e3
commit 3c1cdc3545

View file

@ -32,6 +32,7 @@ Comment[ca]=Connecteu amb els vostres dispositius
Comment[cs]=Dosáhněte na svá zařízení
Comment[en_GB]=Reach out to your devices
Comment[es]=Contactar con sus dispositivos
Comment[fi]=Tavoitettavuutta laitteillesi
Comment[gl]=Chega aos teus dispositivos.
Comment[hu]=Érje el eszközeit
Comment[it]=Comunica con i tuoi dispositivi