Commit 6fe984a6 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 6559a5f6
......@@ -102,6 +102,7 @@ Comment[en_GB]=Help for applications
Comment[es]=Ayuda de las aplicaciones
Comment[fi]=Ohjeita sovellusten käyttöön
Comment[gl]=Axuda de programas
Comment[ia]=Adjuta pro applicationes
Comment[it]=Guida per le applicazioni
Comment[nl]=Hulp voor toepassingen
Comment[nn]=Hjelp for program
......
......@@ -110,6 +110,7 @@ GenericName[en_GB]=Help Centre
GenericName[es]=Centro de ayuda
GenericName[fi]=Ohjekeskus
GenericName[gl]=Centro de axuda
GenericName[ia]=Centro de Adjuta
GenericName[it]=Centro documentazione
GenericName[nl]=Helpcentrum
GenericName[nn]=Hjelpesenter
......@@ -137,6 +138,7 @@ Comment[en_GB]=Browse and search documentation
Comment[es]=Explorar y buscar documentación
Comment[fi]=Selaa dokumentaatiota ja etsi sieltä
Comment[gl]=Explorar e buscar na documentación
Comment[ia]=Naviga e cerca in le documentation
Comment[it]=Sfoglia e cerca nella documentazione
Comment[nl]=Blader in en doorzoek documentatie
Comment[nn]=Søk og bla gjennom hjelpetekstar
......
......@@ -11,6 +11,7 @@ Name[en_GB]=Fundamentals
Name[es]=Fundamentos
Name[fi]=Perusasiat
Name[gl]=Esenciais
Name[ia]=Essentiales
Name[it]=Fondamentali
Name[nl]=Fundamentals
Name[nn]=Det grunnleggjande
......
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