Commit d2f3f65d 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 4309aa81
......@@ -4,6 +4,7 @@
"Name[ca@valencia]": "Canvia la caixa",
"Name[ca]": "Canvia la caixa",
"Name[nl]": "Hoofd-/kleine letters wijzigen",
"Name[pl]": "Zmień wielkość liter",
"Name[pt]": "Mudar a Capitalização",
"Name[pt_BR]": "Alterar maiúsculas e minúsculas",
"Name[sk]": "Zmeniť veľkosť písmen",
......
......@@ -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[de]=KMail-Standarddesign 5.2 (Basiert auf „Breeze Flach“, Autor: Kristofer Rickheden Gustavsson)
Description[es]=KMail tema predeterminado 5.2 (Basado en brisa plano, autor Kristofer Rickheden Gustavsson)
Description[fi]=KMail 5.2 -oletusteema (perustuu Breeze Flat -teemaan, jonka teki Kristofer Rickheden Gustavsson)
Description[gl]=Tema predeterminado de KMail 5.2 (baseado en Breeze Flat, creado por 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