Commit de47fcbe 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 9caf5ef7
Pipeline #41287 skipped
......@@ -11,6 +11,7 @@ Name[et]=KMaili päise teema
Name[fr]=Thème d'en-tête KMail
Name[gl]=Tema da cabeceira de KMail
Name[ia]=Thema de capite de KMail
Name[it]=Tema della intestazioni di KMail
Name[ko]=KMail 헤더 테마
Name[nl]=Header-thema van KMail
......@@ -14,6 +14,7 @@ Description[et]=KMaili vaiketeema 5.2 (aluseks on Breeze Flat, autor Kristofer R
Description[fi]=KMailin oletusteema 5.2 (jonka pohjana on Kristofer Rickheden Gustavssonin Breeze Flat)
Description[fr]=Thème par défaut de KMail 5.2 (inspiré de Breeze, composé par Kristofer Rickheden Gustavsson)
Description[gl]=Versión 5.2 do tema predeterminado de KMail (baseado en Breeze Flat, obra de Kristofer Rickheden Gustavsson).
Description[ia]=Thema predefinite de KMail 5.2 (Based sur Breeze Flat autor Kristofer Rickheden Gustavsson)
Description[it]=Tema predefinito di KMail 5.2 (basato su Breeze Flat di Kristofer Rickheden Gustavsson)
Description[ko]=KMail 기본 테마 5.2(Kristofer Rickheden Gustavsson의 Breeze Flat 테마 기반)
Description[nl]=KMail standaard thema 5.2 (gebaseerd op de auteur van Breeze Flat Kristofer Rickheden Gustavsson)
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