Commit 4bed6f18 authored by Script Kiddy's avatar Script Kiddy

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 eca91edd
......@@ -7,6 +7,7 @@
"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[fi]": "Tämä liitännäinen mahdollistaa oletusarvoisen Grantlee-viestiotsakkeen.",
"Description[fr]": "Ce module complémentaire fournit un style d'en-tête Grantlee par défaut.",
"Description[it]": "Questa estensione fornisce un'intestazione predefinita per la posta basata su Grantlee.",
"Description[ko]": "이 플러그인은 기본 Grantlee 메일 헤더를 제공합니다.",
"Description[nl]": "Deze plug-in biedt een standaard Grantlee e-mailkop.",
......@@ -31,6 +32,7 @@
"Name[es]": "Estilo de encabezado predeterminado Grantlee",
"Name[et]": "Grantlee vaikimisi päisestiil",
"Name[fi]": "Oletusarvoinen Grantlee-otsaketyyli",
"Name[fr]": "Style d'en-tête Grantlee par défaut",
"Name[it]": "Stile con intestazioni di Grantlee predefinito",
"Name[ko]": "기본 Grantlee 헤더 스타일",
"Name[nl]": "Stijl met standaard Grantlee header",
......
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