Commit ab903a07 authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent 7f13d58c
......@@ -491,6 +491,7 @@ Action=Popup
Name=Email added to the send later queue
Name[ca]=Correu afegit a la cua d'enviar més tard
Name[ca@valencia]=Correu afegit a la cua d'enviar més tard
Name[en_GB]=Email added to the send later queue
Name[es]=Mensaje añadido a la cola para enviar más tarde
Name[et]=Kiri lisati hiljem saatmise järjekorda
Name[it]=Messaggio di posta aggiunto alla coda di invio posticipato
......@@ -502,6 +503,7 @@ Name[x-test]=xxEmail added to the send later queuexx
Comment=A delayed email delivery is configured and can be canceled
Comment[ca]=S'ha configurat un lliurament de correu retardat i es pot cancel·lar
Comment[ca@valencia]=S'ha configurat un lliurament de correu retardat i es pot cancel·lar
Comment[en_GB]=A delayed email delivery is configured and can be cancelled
Comment[es]=Se ha configurado un envío de correo aplazado, que se puede cancelar
Comment[et]=Seadistatud on viivitusega kirja saatmine, nii et sellest võib ka loobuda
Comment[it]=Una consegna posticipata di un messaggio è ora configurata e può essere annullata
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment