Commit 9f2df517 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 4e4e93cc
......@@ -491,6 +491,7 @@ Name[en_GB]=An email can be undo send
Name[es]=Se puede deshacer el envío de un correo electrónico
Name[et]=Kirja saatmise tagasivõtmine
Name[eu]=E-posta baten bidalketa desegin daiteke
Name[fi]=Viestin lähetyksen voi perua
Name[fr]=Vous pouvez annuler l'envoi d'un courriel
Name[gl]=O envío dun correo electrónico pode desfacerse
Name[nl]=Verzenden van een e-mailbericht kan ongedaan gemaakt worden
......
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