Commit a59eb609 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 8c978116
......@@ -4,6 +4,7 @@
"Description[ca@valencia]": "Este connector proporciona una capçalera «Grantlee» predeterminada al correu.",
"Description[ca]": "Aquest connector proporciona una capçalera «Grantlee» predeterminada al correu.",
"Description[cs]": "Tento modul poskytuje výchozí hlavičku e-mailu Grantlee.",
"Description[de]": "Mit diesem Modul können Sie ein Vorspann-Design „Standard-Grantlee“ definieren",
"Description[es]": "Este complemento proporciona un encabezado de correo predeterminado Grantlee.",
"Description[it]": "Questa estensione fornisce un'intestazione predefinita per la posta basata su Grantlee.",
"Description[ko]": "이 플러그인은 기본 Grantlee 메일 헤더를 제공합니다.",
......
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