Commit 8d43e73c 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 e5af16c9
......@@ -9,6 +9,7 @@
"Name[pl]": "Powiększ tekst",
"Name[pt]": "Ampliar o Texto",
"Name[pt_BR]": "Ampliar o texto",
"Name[sk]": "Priblížiť text",
"Name[sr@ijekavian]": "Увеличај текст",
"Name[sr@ijekavianlatin]": "Uveličaj tekst",
"Name[sr@latin]": "Uveličaj tekst",
......
......@@ -5,6 +5,7 @@ Description=KMail Default Theme 5.2 (Based on Breeze Flat author Kristofer Rickh
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[en_GB]=KMail Default Theme 5.2 (Based on Breeze Flat author 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)
......@@ -27,6 +28,7 @@ Name[ast]=KMail 5.2
Name[ca]=KMail 5.2
Name[ca@valencia]=KMail 5.2
Name[de]=KMail 5.2
Name[en_GB]=KMail 5.2
Name[es]=KMail 5.2
Name[fi]=KMail 5.2
Name[gl]=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