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 fb4508c6a7
commit bfb96b0f67

@ -111,6 +111,7 @@ Action=Popup
Name=Removed successfully
Name[ca]=S'ha eliminat amb èxit
Name[ca@valencia]=S'ha eliminat amb èxit
Name[en_GB]=Removed successfully
Name[gl]=Retirouse correctamente
Name[it]=Rimossa con successo
Name[nl]=Met succes verwijderd
@ -123,6 +124,7 @@ Action=Popup
Name=Failed to remove
Name[ca]=Ha fallat en eliminar
Name[ca@valencia]=Ha fallat en eliminar
Name[en_GB]=Failed to remove
Name[gl]=Non se puido retirar
Name[it]=Impossibile rimuovere
Name[nl]=Verwijderen is mislukt

Loading…
Cancel
Save