Commit 44c64336 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 40aacb98
......@@ -6,6 +6,7 @@
"Name[de]": "Groß-/Kleinschreibung ändern",
"Name[es]": "Cambiar mayús. y minús.",
"Name[gl]": "Cambiar as maiúsculas",
"Name[it]": "Cambia maiuscole/minuscole",
"Name[nl]": "Hoofd-/kleine letters wijzigen",
"Name[pl]": "Zmień wielkość liter",
"Name[pt]": "Mudar a Capitalização",
......@@ -7,6 +7,7 @@
"Name[es]": "Insertar carácter especial",
"Name[fi]": "Lisää erikoismerkki",
"Name[gl]": "Inserir un carácter especial",
"Name[it]": "Inserisci carattere speciale",
"Name[nl]": "Speciaal teken invoegen",
"Name[pl]": "Wstaw znak specjalny",
"Name[pt]": "Inserir um Carácter Especial",
......@@ -7,6 +7,7 @@
"Name[es]": "Estilo de encabezado predeterminado Grantlee",
"Name[fi]": "Grantlee-oletusotsaketyyli",
"Name[gl]": "Estilo de cabeceira predeterminado de Grantlee",
"Name[it]": "Stile con intestazioni di Grantlee predefinito",
"Name[nl]": "Stijl met standaard Grantlee header",
"Name[pl]": "Domyślny styl nagłówków Grantlee",
"Name[pt]": "Estilo de Cabeçalho Predefinido do Grantlee",
......@@ -9,6 +9,7 @@ Description[en_GB]=KMail Default Theme 5.2 (Based on Breeze Flat author Kristofe
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)
Description[it]=Tema predefinito di KMail 5.2 (basato su Brezza piatto, autore Kristofer Rickheden Gustavsson)
Description[nl]=KMail standaard thema 5.2 (gebaseerd op de auteur van Breeze Flat Kristofer Rickheden Gustavsson)
Description[pl]=Domyślny wystrój KMaila 5.2 (Oparty na Płaskiej Bryzie autorstwa Kristofer Rickheden Gustavsson)
Description[pt]=Tema Predefinido 5.2 do KMail (Baseado no autor do Brisa Plano Kristofer Rickheden Gustavsson)
......@@ -32,6 +33,7 @@ Name[en_GB]=KMail 5.2
Name[es]=KMail 5.2
Name[fi]=KMail 5.2
Name[gl]=KMail 5.2
Name[it]=KMail 5.2
Name[nl]=KMail 5.2
Name[pl]=KMail 5.2
Name[pt]=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