Commit 5193324d 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 1759e356
......@@ -25,6 +25,7 @@
"Name[ca@valencia]": "Estil de capçalera «Grantlee» predeterminat",
"Name[ca]": "Estil de capçalera «Grantlee» predeterminat",
"Name[cs]": "Výchozí styl hlavičky Grantlee",
"Name[da]": "Standard Grantlee header-stil",
"Name[de]": "Vorspann-Design „Standard-Grantlee“",
"Name[es]": "Estilo de encabezado predeterminado Grantlee",
"Name[et]": "Grantlee vaikimisi päisestiil",
......
......@@ -4,6 +4,7 @@ AuthorEmail=montel@kde.org
Description=KMail Default Theme 5.2 (Based on Breeze Flat author Kristofer Rickheden Gustavsson)
Description[ca]=Tema per omissió pel KMail 5.2 (basat en la Brisa Flat de l'autor Kristofer Rickheden Gustavsson)
Description[ca@valencia]=Tema per omissió pel KMail 5.2 (basat en la Brisa Flat de l'autor Kristofer Rickheden Gustavsson)
Description[da]=KMail standardtema 5.2 (baseret på Breeze Flat, ophavsmand Kristofer Rickheden Gustavsson)
Description[de]=KMail-Standarddesign 5.2 (Basiert auf „Breeze Flach“, Autor: Kristofer Rickheden Gustavsson)
Description[en_GB]=KMail Default Theme 5.2 (Based on Breeze Flat author Kristofer Rickheden Gustavsson)
Description[es]=Tema predeterminado de KMail 5.2 (basado en Brisa plano, autor Kristofer Rickheden Gustavsson)
......@@ -29,6 +30,7 @@ Name[ast]=KMail 5.2
Name[ca]=KMail 5.2
Name[ca@valencia]=KMail 5.2
Name[cs]=KMail 5.2
Name[da]=KMail 5.2
Name[de]=KMail 5.2
Name[en_GB]=KMail 5.2
Name[es]=KMail 5.2
......
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