Commit a5a81497 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 e7cf6598
Pipeline #24476 skipped
......@@ -494,6 +494,7 @@ 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[cs]=E-maily přidané do fronty pro pozdější odeslání
Name[de]=E-Mail zur Später-Senden-Warteschlange hinzugefügt
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
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