Commit b8448524 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 5e68ed47
......@@ -25,7 +25,7 @@ Name[et]=Kontacti seadistamine
Name[fi]=Kontactin asetukset
Name[fr]=Configuration de Kontact
Name[ga]=Cumraíocht Kontact
Name[gl]=Configuración do Kontact
Name[gl]=Configuración de Kontact
Name[hu]=Kontact beállítása
Name[ia]=Configuration de Kontact
Name[it]=Configurazione di Kontact
......@@ -70,7 +70,7 @@ Comment[es]=Componente predeterminado de KDE Kontact
Comment[et]=KDE Kontacti vaikekomponent
Comment[fi]=KDE:n oletusarvoinen Kontact-osa
Comment[fr]=Composant Kontact KDE par défaut
Comment[gl]=Compoñente por omisión de Kontact do KDE
Comment[gl]=Compoñente por omisión de Kontact de KDE
Comment[hu]=Alapértelmezett KDE Kontact komponens
Comment[ia]=Componente standard de KDE Kontact
Comment[it]=Componente predefinito di KDE Kontact
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